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 440F5158094 for ; Thu, 8 Sep 2022 14:05:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 422B7E0AD1; Thu, 8 Sep 2022 14:05:17 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16509E0AD0 for ; Thu, 8 Sep 2022 14:05:17 +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 EA566335C11 for ; Thu, 8 Sep 2022 14:05:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68A015BE for ; Thu, 8 Sep 2022 14:05: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: <1662644535.2d2ea09be4f3ad4637ec6a047de83ce7e23e564e.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.10.142.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2d2ea09be4f3ad4637ec6a047de83ce7e23e564e X-VCS-Branch: master Date: Thu, 8 Sep 2022 14:05: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: 6dbec99a-2c80-4835-a1d4-de582f75e547 X-Archives-Hash: ddbff2801edade4f91e8e7a3a7965b1d commit: 2d2ea09be4f3ad4637ec6a047de83ce7e23e564e Author: Michał Górny gentoo org> AuthorDate: Thu Sep 8 11:18:07 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 8 13:42:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2ea09b sys-kernel/vanilla-kernel: Bump to 5.10.142 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.142.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 043e185a95c0..463a564a88b1 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -26,6 +26,8 @@ DIST linux-5.10.140.tar.sign 993 BLAKE2B bf0428036aebe23af73b783d29c87ab99a068f0 DIST linux-5.10.140.tar.xz 120465880 BLAKE2B 3d0b610a3869fa46d3a3e28d839d84600924b3e4ae7560ca7d0fc6506572bab18550b16e0dfb357368bb9679b29f69efe627f12d79c8110b280cfe1d1db140a5 SHA512 90adb9ab6d3cce058840cd2b286c7336c436a409210e651cd065c5089fa36b6d22e03c48e7eb681aa79b7899e77176fbcd39927089ef5bddc1bebfbbb69d694e DIST linux-5.10.141.tar.sign 993 BLAKE2B 8012311f8e1cb9e89bca16912b1669cb8ed96a6fabc3b2165cf700d082f8efa2b144c1d8eb12b2bd093992e30f72ef7037f7df6ab791752cfe35631110511081 SHA512 9b9666de0972ba91324fda56e7f4b5e355a48f7833c45fa89b0ee0cade3a60f00a4305cca3654c96e3bbf1253a3a11ad52e5e9fafccf84e20bbf23d8b77c5fcd DIST linux-5.10.141.tar.xz 120487196 BLAKE2B 72fc10716b42043d8eceef04dcb2d9df94b78514decb237c1e47d1f5679f83079e19e66c57fd5643403e142f2ed6a3ae712fe6940f5d9f9be61771eb431031dc SHA512 e484ee2535732234ad610e49d30d6ec7d5ffdb5c0638cb598607ec488d8d555fcb025782fbf05ee2159a840949b7c070f20b7a393e86b43d1c2af80fd30a179c +DIST linux-5.10.142.tar.sign 993 BLAKE2B 7f65b253676cca9b4d88ddf5e2fca6548379252408631fed5a66774c2d988b2febae8efb9e78f3dca721b7c419966087188a011f38b23352030bbeb6a78f1f9b SHA512 00a9709ff49c5ba50c495178c9e0e93c51132cb387534dbd48837bd9e7a8d83baf204621570e5ccfd649da4d3389165a6bbf1487f92072ade644eee23081d798 +DIST linux-5.10.142.tar.xz 120490684 BLAKE2B 12819fefca748e8e4e320a3b709f3c1c026d204a728d649cb15a7cc6937d80588c1b114adf242928450cd37d21e869088df846ee4ef5ffd87e56fb60b0f2df8f SHA512 06b8977654a2e2e1109398e617d4f253d204134182f3982e271abfda054805d56cb70ad8b26a3b3b5c821a127990da76529799810a95dbed442b894acedf867a DIST linux-5.15.63.tar.sign 991 BLAKE2B 855d118b3164e1ea14789647f173000eaaee7dfc27f27da497c1b6fb787b35d47269d2c233f0a79aa3560be7a1c9571b2c52a8a78fce1d73f400d9d21a17b7c3 SHA512 99f256fc013ee63c918eb521e741347c958a8ba018d5136e960686952fbb510416a80413d3dacc5a994220e6d8866a427ed8476ec172f48c03f34be4b93f33ac DIST linux-5.15.63.tar.xz 126441480 BLAKE2B 95264d45411bb0ba30b0eadc2847075d0763bdc22aa86b250861ea18066a1b16b88627c61d0829d7b0a21e9e478df064a54b343ecb2065b37a011bc0cad986c6 SHA512 a1b33476484b9ca7a105d07b70835ad7e7e670750e6beb428ce23fe1bd853d66cd8a1ffca9ee736a98a42b98191d290127e628d33118be971c661e2fc6faf8ca DIST linux-5.15.64.tar.sign 991 BLAKE2B 0f6101a3f7d34da6f5bccc3178741089442625a7bc240468b4469510d5a769292928bb6f4d5c9141c81defaf097bedb67e8c110b0a966832b71f20a318e46eac SHA512 84c37bcb8a53f8d1f0e8fc3061efb7ab8e2ef476374bc2fc92985c51876bf5895a18fc67d9e35c32065ef35eca3d4bd120705c647e4f4c41e666a24c602dba30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild new file mode 100644 index 000000000000..718e3ea82627 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.142.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +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/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-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="debug hardened" +REQUIRED_USE="arm? ( savedconfig )" + +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 + + local biendian=false + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm) + return + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + hppa) + return + ;; + 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-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + x86) + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + local myversion="-dist" + use hardened && myversion+="-hardened" + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" + + local merge_configs=( + "${T}"/version.config + "${dist_conf_path}"/base.config + ) + use debug || merge_configs+=( + "${dist_conf_path}"/no-debug.config + ) + if use hardened; then + merge_configs+=( "${dist_conf_path}"/hardened-base.config ) + + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) + + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) + fi + fi + + # this covers ppc64 and aarch64_be only for now + if [[ ${biendian} == true && $(tc-endian) == big ]]; then + merge_configs+=( "${dist_conf_path}/big-endian.config" ) + fi + + kernel-build_merge_configs "${merge_configs[@]}" +}