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 6C6D3158094 for ; Fri, 22 Jul 2022 05:30:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDDF8E0ACA; Fri, 22 Jul 2022 05:29:59 +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 518C3E0AC1 for ; Fri, 22 Jul 2022 05:29:55 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59F1F341041 for ; Fri, 22 Jul 2022 05:29:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAD89549 for ; Fri, 22 Jul 2022 05:29:52 +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: <1658467783.5bd0b6e9b833902e6c43ceda6acde373d598e988.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.132.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5bd0b6e9b833902e6c43ceda6acde373d598e988 X-VCS-Branch: master Date: Fri, 22 Jul 2022 05:29:52 +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: 374a636d-eaf2-452a-88a6-2727f02278fd X-Archives-Hash: add1902d60dbdd5f98c3cc3ff7d24ee3 commit: 5bd0b6e9b833902e6c43ceda6acde373d598e988 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 22 02:22:56 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jul 22 05:29:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd0b6e9 sys-kernel/vanilla-kernel: Bump to 5.10.132 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.132.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 8bb8562afcb9..4edcb1f60083 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -23,6 +23,8 @@ DIST linux-5.10.130.tar.sign 993 BLAKE2B 840db76a087d3c197a14edcba8dd0f69efe29ab DIST linux-5.10.130.tar.xz 120428404 BLAKE2B 21ee79ad11b3c0982f3e532b198f18bbe704aa98030345e7f0bd1e06eb84f3258f84bc1e24b2bf701933ff395b9aeaa28941015a990f6bd408dd2ece3894bebd SHA512 a0d37685f11bcf93c96ddce1d64881ada3cd9e25dd0006e923c7caf8314d106e9779bda8cd49712b8574e810c37dd91f09c0014b37e84eb5d32fe330a4c529fc DIST linux-5.10.131.tar.sign 993 BLAKE2B 7cbda729dcd13f8bff49af2efd68f4afe960a7f597f3f4b9e55ea8f7b7260ce3c7aee822df6be6d1fe4aa29302f857399112c2e025cb29f7700d7f909dd2aede SHA512 4229649ddc27771a85263d1c0494a6e23386d6736c5f88b7467eb816ec2da5b9d75d6318c5566c33eaa944fc05b7beb2c783cc3b6017d25037fbf6cd5e376988 DIST linux-5.10.131.tar.xz 120443592 BLAKE2B 04fcb8735aa26c2502b0191cf407cd8c8f1b3bc8c6f9348d2fd42b65068bb193dbdfcb23ec9861a2b1f91de269fc5cd067f7246a56bbfdbabd125b03a1e0c096 SHA512 e10855093eab9504d0307b7787a2c0f55e952560a971649508f83bf26471739e6a009e54af2dab30ecc15b4020e65a0a37603526b81d2d9be405e0b01faef7f1 +DIST linux-5.10.132.tar.sign 993 BLAKE2B 6a6b55885d0b7fdb00b631d0d0f304e9346eb82482a93c22524612c4470dd927d48baeff3680153bdbf673bfdceaf45b97ac88944bc1b5a8be685f76d8cf44cb SHA512 81a2061723df738eda1992f23f40299eb9c1508a1f6a79df3c063931d6a0fafd8d4508acae667b9ff1c2b3ef4adb48e3514b6dcedaff4c957c8fb677c3a56104 +DIST linux-5.10.132.tar.xz 120432520 BLAKE2B d1abd82c248ac610ffcf2b7c713a647f97b2ab186a54b3ef9ab69ad7c2a647b04f254dba6cafa71ef742ea4a385034bd27883ccd1f5857f0ce0ca6fcd93e6597 SHA512 e1bfc069a91c111a81694e6ecf71f995a33a9dcf89e31ee7c9e01821bc1fb00c1b895cb1786bc62d398c6e9dc657ceb3f6b8033b50b17e77cce9a82039ca5c86 DIST linux-5.15.52.tar.sign 991 BLAKE2B 321a5eb8fd8cad2d14705ffdea3fc0ad5cc4618defbe8426b978aac10c28dbf0b4f15a571c16c22ff2437f87ab8d70ade815c5f76ce0d763ad66846a27e02349 SHA512 1ab45e728a768b704ff52551e31cf91fa8a6ec008e3f2aef387b925ab18dcd837f4a4b71f85a7bb96b0ab403c39757ddfa8d22578117728f594768904bc5ce62 DIST linux-5.15.52.tar.xz 126364084 BLAKE2B 9baf5b0182df91790716f3629a6e163cf87d8e9bde79350f30432e7446d2033de9d081f1693a758a3830a26c03a8bc13713394fd82457afde33ecfb9e353de2e SHA512 01852559b30b177ba350827b076dc58ecad020e63940482e694286ade3debe53919a4514338536f46da1aa4f89b671368a112a913a53a0352d033252bc6b2a1b DIST linux-5.15.53.tar.sign 991 BLAKE2B 4d890ec6f124577094dfa178fd64dcbb99ef7f07f3ab5bc6c5591c1a2304286ad8285b3d7bb405cb127b33f05a4bd2bb03d0e438f50c1fc466346e3530814a85 SHA512 e7206e9551b89b3aed1835d8e29832ad457d4c375ccd53c4306bd390d714a6a9329d4bb2f71bc2c2dc4bf932ada7131c5383f23a2d71c44b6a0a8365de7a9b7a diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.132.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.132.ebuild new file mode 100644 index 000000000000..96cb3e86fc4b --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.132.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/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-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[@]}" +}