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 E6AB2158020 for ; Mon, 19 Dec 2022 18:40:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40FA2E0ACD; Mon, 19 Dec 2022 18:40:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2A60CE0ACD for ; Mon, 19 Dec 2022 18:40:41 +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 6A4C43417A2 for ; Mon, 19 Dec 2022 18:40:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 705387DE for ; Mon, 19 Dec 2022 18:40:37 +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: <1671475147.ca4f5f87cdc13328d8e93c375732971923653728.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.160.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ca4f5f87cdc13328d8e93c375732971923653728 X-VCS-Branch: master Date: Mon, 19 Dec 2022 18:40:37 +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: 4896cd3b-e8e7-4451-9e12-b917154ecede X-Archives-Hash: f3861d307b079f8e1cd2991aaebec043 commit: ca4f5f87cdc13328d8e93c375732971923653728 Author: Michał Górny gentoo org> AuthorDate: Mon Dec 19 13:37:18 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 19 18:39:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4f5f87 sys-kernel/vanilla-kernel: Bump to 5.10.160 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.160.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index da742a6aec86..6e9f2635e9fa 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -32,6 +32,8 @@ DIST linux-5.10.158.tar.sign 993 BLAKE2B 237cdc0e11ed324e39587117d5c4132019b858b DIST linux-5.10.158.tar.xz 120510028 BLAKE2B 370b99fa0953482269a1d1dc2a8ebf81175b0c10472c271802b6ddee6262502034245df807487d0f1f92c24ca675f1be129a2099654001543a7e2d24c2378c12 SHA512 45bcb3c145500607d6328662776a5bd4e2fabe882677fefb5fcbf0377504ed1ca4ccddf1aff0a0f6b85ab79f6e9f91fb1377c33a7e14c7f352fa02ec40e67f4e DIST linux-5.10.159.tar.sign 993 BLAKE2B 102b3a17297dcf024b72499563f716b5034917158bdc1cd59173983f0b9f170b9bea49062da0a891505fe7c8bf8ef2667a9ead69b68ebf0ffb528b5e20d7958a SHA512 d544a5c7ac258c2ee2dfeec258eb502446a59520100c8fa16c7d4e1b4ee66931c795863aa6073b3b54e2e3ec968e1612cd046862add08f9199cef01fa37abf46 DIST linux-5.10.159.tar.xz 120503752 BLAKE2B 5ca970ad105304f4c2afbd75ebbe750b87793e9830834b034fe195811df3e1a060c3752a99f53a1cf9d1ce1f6e877e08e638833a1e3d797181adc5a45ec56178 SHA512 8427677bd7248abf560dba5402a395a51afb1e47cbeb4f34afddbdacc29b4c92648d651bfc04ec85f16b96b9b8d8d46dbbdec7d112c84f967ffc271633274542 +DIST linux-5.10.160.tar.sign 993 BLAKE2B d445a61fd7117e2875830bba05d60d84b9c77e83d25a72707e4f987d53206ecd05b232d08bc9f3864c286b0370e600412c52bac75705fc549bbeb45edd712c45 SHA512 f5331dd0a79cb88d83a3a260152ec58c38a5ad8d8466dfc42c614f2e1cdb81847ad92043eac726cfbca2f5351151008785ea56349e9d80bf8e1405645743dfe9 +DIST linux-5.10.160.tar.xz 120522072 BLAKE2B 34eb54371a27650a03903175ddbc45952f49808f48a9c5fe69e5d6a2b77ed7171818137c13a020df9df3ec7981d1ee510c8492ba35d2ace739eedf3fe8ab71ef SHA512 cfbae7c9a332286fd3122bb785808f3d7edb6d94ab17f3d263a4cb19f614633085e9e4f595368d263b80a8218d186911792631b8eecfa9c4c91a31315598b28f DIST linux-5.15.77.tar.sign 991 BLAKE2B 9f4d4e7d3f21a02f95771d7931212f026ed2543c8e7e6c6e96fa83b87eca089c18f131a9242519e13b1c4ce01ae86503097e6ad1b79316c203184166d27d468e SHA512 eecda297590a14f010af600cd757cbede856665d6bd09fb9f95b88ea2650bf4ec18ba7366348d66e898237812311a757f1d640986815dca49bad7869027682af DIST linux-5.15.77.tar.xz 126468704 BLAKE2B dcb7d95f577be18735f14c1a75148579af40bc35e57228eb7d35453cc8ddf9b6f9f71a7a15608be22049557ba307eabf5df42504f95cd6f414711733ff6b0738 SHA512 3b557ad399606deb2e00077da7c57af534ff5bd395297db534a9c643ff6e95b29b315d15bcb453255875785264347949a7e52ef3a676b7dd12db10764a6a5646 DIST linux-5.15.79.tar.sign 991 BLAKE2B 49494481a44ee6917f39b985a08f544e3295ece6c1b143cf27248b10975e4c2610d5f7102c9df1606478ae18689429d6971ceccb78e8a06f1d76746628cfe243 SHA512 6bf59132c8d773d663209266393b5d327fb60ab7dc6f150aba1ba32cd1c4a47304a28a548114999d208cd24fb14418181317eb6dc7c37c840a489aa934ed5c7f diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.160.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.160.ebuild new file mode 100644 index 000000000000..beb11365e70a --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.160.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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[@]}" +}