From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4749015808B for ; Wed, 23 Mar 2022 16:38:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FD21E091A; Wed, 23 Mar 2022 16:38:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71530E091A for ; Wed, 23 Mar 2022 16:38:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25E08343251 for ; Wed, 23 Mar 2022 16:38:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40CD634C for ; Wed, 23 Mar 2022 16:38:49 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1648053520.db47af3d2cf70fc492b8b78f3baefeb0444af798.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.4.187.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: db47af3d2cf70fc492b8b78f3baefeb0444af798 X-VCS-Branch: master Date: Wed, 23 Mar 2022 16:38:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5173a8d1-e0e2-4af4-a795-9ff5d98ad6cf X-Archives-Hash: 6e6b3ef9b25d1dace5c9fdd850355185 commit: db47af3d2cf70fc492b8b78f3baefeb0444af798 Author: Michał Górny gentoo org> AuthorDate: Wed Mar 23 13:05:01 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Mar 23 16:38:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db47af3d sys-kernel/vanilla-kernel: Bump to 5.4.187 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.187.ebuild | 108 +++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 0d066d9af666..7552152fbb28 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -37,3 +37,5 @@ DIST linux-5.4.185.tar.sign 991 BLAKE2B 5508bfda73f95b84314ebb907181befe43615af5 DIST linux-5.4.185.tar.xz 112889592 BLAKE2B f44cf6b306b254533f15dff3820bf014937fcec88c75468da84b4eb403cbe1fa5ca5a830ee5f73fb3c57b7af1510cb6a7ede531836e6599c5b044e353fa11b3c SHA512 491faf373500757f77e26e4cb402b51bc79ef220ac90579b02fa2cd25f7e524873fe4b5f971a71d41d198baed9905154c21b70c0387c2ba2285d3f1da730e6f7 DIST linux-5.4.186.tar.sign 991 BLAKE2B 6272e71e1e9b34590c73eeabdba16f1224405617fd9a57fa94090c2d697f51499c6e77424616dc043c37c0e68a519c736396394b97d4f93b519b1fe9f22e6a0e SHA512 d69a8c97815396fc01e24930df2c39db17894cd52081967de98d9179856253db8a20b86cb172cf1120d6d157d5a7258d9a192687da60614fef7c3fed49f96b8d DIST linux-5.4.186.tar.xz 112884120 BLAKE2B 30b48c13ef072dbc8a5886a23450212a436aec236bf7c01cd119fe7d6f12f31d3b1296930aaac641a7545d2d1b925bb571d483c85718b4a537b828d39d29932b SHA512 cebe4a5b2b45c77b96bda61f04db563fd9fded503eb057db748329b39c541ff8ca9d49f6a04d40c413b0cdf9917a666d5cabeb4011760229aad794f41c300543 +DIST linux-5.4.187.tar.sign 991 BLAKE2B ebb5039e2bb4a2a570bcabddcc0457195c1d3b459b76d92be310e9763905dc3e37d7832ef42f7a1b60325ef1947dbead6c58371f970d2fea1fe9e07e0299036b SHA512 d191391a4af6bba8fb54db0e97648dbac7035cafc3f091f2afb290f2205e1c8eebfd19a407c7cbfc667199a5c5697272d2dbfdd59f5366e7482cc539e4c8ab6f +DIST linux-5.4.187.tar.xz 112896008 BLAKE2B 0f3afac5695185fee529660a4c3982efb02ab29963927aebfc6098fb38970c0030f8302a65b8786a8ef91fb182d2a2a6dd6e084ca7c958dd21d38c36a10b79d7 SHA512 8cc9fb9d2ef1fe4036620f66c247c8b53b851c752822af1fa1bfe4dae51c7dbbe84b28443d624b4aa40197392f998e01e0f766d28301af4c2e3d13aa396e0b64 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.187.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.187.ebuild new file mode 100644 index 000000000000..4f5f7870ccb8 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.187.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=g1 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + amd64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + ppc) + # assume powermac/powerbook defconfig + # we still package.use.force savedconfig + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die + ;; + ppc64) + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die + local merge_configs=( + "${T}"/version.config + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +}