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 392D915800F for ; Mon, 6 Feb 2023 19:04:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1482CE086E; Mon, 6 Feb 2023 19:04:40 +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 E520DE086E for ; Mon, 6 Feb 2023 19:04:39 +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 A4D35340B6A for ; Mon, 6 Feb 2023 19:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 419E38AA for ; Mon, 6 Feb 2023 19:04:35 +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: <1675708870.8652fad58f265f17654c82fa45ce151bb9b26667.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.231.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8652fad58f265f17654c82fa45ce151bb9b26667 X-VCS-Branch: master Date: Mon, 6 Feb 2023 19:04:35 +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: 97c55409-5fba-430a-a1af-fe3ca96d7670 X-Archives-Hash: c370490e3c04df5be64b7e5968bc11f7 commit: 8652fad58f265f17654c82fa45ce151bb9b26667 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 6 14:28:34 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 6 18:41:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8652fad5 sys-kernel/vanilla-kernel: Bump to 5.4.231 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.4.231.ebuild | 111 +++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index e64e48bbfd38..9ace53818da7 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -52,6 +52,8 @@ DIST linux-5.4.229.tar.sign 991 BLAKE2B eb0661f4b438e0fd40b61ba1472516f7f321edea DIST linux-5.4.229.tar.xz 112993120 BLAKE2B 746a722876f8e7c06596a06e1b026e294e368e1483b4d367f8d6214571f7d526191ded2afa725e8dc158d947a00c79840c4454d1a2a103512679b781f5ab5867 SHA512 3dda77f5af8a9b02ac6310770e9c43f06f2083da731c24140de90b6df62227f33fc88a47c110015d6504d849315effc5fef21e6d685052cc68d4459416350d16 DIST linux-5.4.230.tar.sign 991 BLAKE2B 2c3156eae9fabacb94ff2cbf1806bfbeb5d4f37b8b505ba94cd2b270de80db9434eeaad3d1249969bc8d0e487aed28a91773007ee506edc46645233e41b4af54 SHA512 fcdda547094f3b632a054d8333d255679581fd140979177d9e803cce28d19617e025857430484a5a804386b869736d94d15c1921248db032edff3883e437871c DIST linux-5.4.230.tar.xz 112976656 BLAKE2B d3f6aa820af4f4db4d27ac46aac41593a7f7b8fb7ef65cdf5d3196395ff30040e9eae27a6605e1243a1406b6df295c3cd69dcfcc82975af79cd477e920633288 SHA512 ed0fe1b46b288bba49c60d4ed5c1016d014d325bc39c3df1403ff76346edafbfd2d222411153ee964cb727eedea0670e505a74a1e48f59f850ff4306c5c48362 +DIST linux-5.4.231.tar.sign 991 BLAKE2B ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d SHA512 31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0 +DIST linux-5.4.231.tar.xz 112992720 BLAKE2B 228c7135bbf38fa0a84d41607a922e269162bdb385e65ab8fcc8f66ae30d5d1ff65075494de24e280dd9bc03fa8324696ab61a556abc0cce58b31d506af413b9 SHA512 22558009d6502928bca5eb93f086b7eb37ff2e742382ba27b97e4dfc77b3b7064b0f85e78d4cba4308ddb2ed7169e25bc62a82647ebedeac1b3df6977c096c52 DIST linux-6.1.10.tar.sign 989 BLAKE2B 0789b7747202146860f8ad39e21f73a6818b6bb901699488943dedb4e0c0ed85bf86890b97169a4f04a1d1d89b56e1ff7ceeba0d2f926e18befc4b40e3c4d335 SHA512 f44a5272a3e1dff01108c09e0f854b3415909b7937db5b89af52b58f4d5724276394fe3693182f68a46a231a5b3cd7e18e16cd5189af4b66795f1e087f1d9db4 DIST linux-6.1.10.tar.xz 134789244 BLAKE2B 926c499eb3260e4358b8112785e7be74062aca54b4d5c21d2729efc81329ae168c461d32f54061d8db05a12cac45b63ca97b74084a8af8138f547c3a2fc2d947 SHA512 7bec1d76ecafd89fdb13bc7c9c69b4f378e41b29aed33c302b235540f40f1d5e6b3c653d2dea83c2d03408e324ffa73ff3dcc7c47c685572719d62bc66a06a1d DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a5e9caa98902df1d37115e87627470680250f256f80aaf3a3152d11b42658e0c89ead28ef1b88df2aa77b8d SHA512 8b31481f4e8034f453129f98d8caadedfd771d7a9ba23c2e41c2f932261263183ddf78ceafea3f38c14f441c2c857caad0ab98056da510d78a21d2fc35774ba7 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.231.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.231.ebuild new file mode 100644 index 000000000000..0e9fbe2eb0d3 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.231.ebuild @@ -0,0 +1,111 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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=g6 + +DESCRIPTION="Linux kernel built from vanilla upstream sources" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + 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/projg2/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[@]}" +}