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 ACFEA158086 for ; Wed, 1 Dec 2021 16:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 716C02BC061; Wed, 1 Dec 2021 16:33:18 +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 435FB2BC061 for ; Wed, 1 Dec 2021 16:33:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 35E0E342F12 for ; Wed, 1 Dec 2021 16:33:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 934B8206 for ; Wed, 1 Dec 2021 16:33:14 +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: <1638376387.a74aa4511954b0c0e6922762272d80d5b4da6b38.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.163.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a74aa4511954b0c0e6922762272d80d5b4da6b38 X-VCS-Branch: master Date: Wed, 1 Dec 2021 16:33:14 +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: c4fc0707-24dd-448d-8d93-2b4c7885e8df X-Archives-Hash: 1600efb825ac07ca264554d440fc32db commit: a74aa4511954b0c0e6922762272d80d5b4da6b38 Author: Michał Górny gentoo org> AuthorDate: Wed Dec 1 14:04:47 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 1 16:33:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74aa451 sys-kernel/vanilla-kernel: Bump to 5.4.163 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.163.ebuild | 102 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 830ef79ec8ee..bb8b7f8c60f3 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -62,3 +62,5 @@ DIST linux-5.4.161.tar.sign 991 BLAKE2B 014e52640c29b7653dfb210d0a511a6c5cd8d01e DIST linux-5.4.161.tar.xz 109179704 BLAKE2B 7fdc397e484018e1036dfb3a9d89971a3a5f60e37e6e77c3e021e704da900bd06ec68f3dcc051a48180f1a9220f3a59872629bfafe4b79abe1275809c5deeba3 SHA512 b066830143e2b8dc4e671a09b9058dfb0d82e3776c9158bdb0bee97546e68110754148f4bd20d4c8a293fa7cb43fac518713b1edd55fda05f9f00277ea7ca031 DIST linux-5.4.162.tar.sign 991 BLAKE2B 34133ffa90b10dbc87c21791ff46e3f1b0f9fbc5299f7dee07440ac445425c0a3f3359e4ee270d54549610a16e15bc432cc71834b31487b5362ac58ec9f1aecf SHA512 e088b2a19f264ec3644af8f1cb62a0e61dd07c36f29595825f35c7552aab29b325ff2554a56f21793d451bda57c797720c8b0e5b5419946fe9d451ee6a7c19bc DIST linux-5.4.162.tar.xz 109187916 BLAKE2B a3a877e3af64ec7480029a3e03285ee18dc7a599e704f56e618f9d9f07cf6939b5a011f064d62400b9b9b87898857f69f9549edc0b77aed310969be2652a4efc SHA512 1023f7e377ab94a8ae5d2d36f33ec6938ad0386cbdcd059a3718718143fbcd75339c1a99941a54dee5ea346f8e919f89685e0e8290b842d0527baeff77e18e4c +DIST linux-5.4.163.tar.sign 991 BLAKE2B 1904e491d0f3e10a7e0fc8c327bf82e51b9907374378908a3a529c04158c1b972bda35c0d279774bef821cfe38e3f3cbd58aaefad3e5535cbb9c85cce1d299c5 SHA512 d536e2b3cfb5e174c3546c166d8a8330a90e58c5d5d2a4e0c07744a8ea6c5899d354f4b25e2d9dbd465919509520d730f7bc2afef3c20943c28e3b96f902861b +DIST linux-5.4.163.tar.xz 109184420 BLAKE2B f312530d7af4480e30695231660a916f536095ffc00deb22afbe4ff715418bc8cc1a45aebbe0621ca09ddf1fda733f54ceb69bf5bda9937299f8cbfbaeee6adb SHA512 61c03176ddd533cdd7ecb654765524b6a9c634cb48766630420137e1fa3e11d6081b054ffb6a93b01bc4417c3947412353e0ff039e25ff880f27424f7ae738e6 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.163.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.163.ebuild new file mode 100644 index 000000000000..42230c7d1fb5 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.163.ebuild @@ -0,0 +1,102 @@ +# Copyright 2020-2021 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=5.4.114 + +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/v${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 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( app-crypt/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 + ;; + 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[@]}" +}