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 7260F1581D3 for ; Sat, 25 May 2024 19:58:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D705E2A18; Sat, 25 May 2024 19:58:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 01170E2A18 for ; Sat, 25 May 2024 19:58:44 +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 E331E343012 for ; Sat, 25 May 2024 19:58:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26E0E1B5E for ; Sat, 25 May 2024 19:58:41 +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: <1716667087.804f16206d84bc2e8e11e70215148359bf30b839.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-6.8.11.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 804f16206d84bc2e8e11e70215148359bf30b839 X-VCS-Branch: master Date: Sat, 25 May 2024 19:58:41 +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: 28e7ce15-a282-4a00-b20d-151e12c4e745 X-Archives-Hash: fb447b17190debc3c2ece950ff89775f commit: 804f16206d84bc2e8e11e70215148359bf30b839 Author: Michał Górny gentoo org> AuthorDate: Sat May 25 15:59:41 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat May 25 19:58:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804f1620 sys-kernel/vanilla-kernel: Bump to 6.8.11 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.8.11.ebuild | 143 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 9993dab8bbb8..b838a266b765 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -46,5 +46,7 @@ DIST linux-6.6.32.tar.sign 989 BLAKE2B ddfd3ca2ccda00a7550f6f42bdebccdf3564a5451 DIST linux-6.6.32.tar.xz 140213376 BLAKE2B 6456fcafe10eae6c0cf962b651aa567ba9ad522c4df0c87301ab0060313b8179a818a1d305e0af21599bc5b7bf42e2f61121a2ee0658a065524d098eb2947f0e SHA512 e8b8d05faeb0c8a467e36fbec87643f35bf868caf6f64d10bee2a2e18566bc586a9770c247c1fb82a6af811455d5c2d5f313703b05778069c95c5434b418b3f0 DIST linux-6.8.10.tar.sign 989 BLAKE2B 4c38e702a545742f56e899f0905734692b7157c1c6df9503df2361cc9f00561a8b6e8ef91a16dc70c419e0da88e5cfc8aa47df0f274085d70ff2d1929f9403dc SHA512 b54c28d60f29811f1f799aa1278e0a14bdc2afb2ce680f269839910d99e96fe8b1cf1410b435a80bbacdf3a6c2a249236c1e75b7b0ca6fa4d8e6dc3654ddc2f7 DIST linux-6.8.10.tar.xz 142586612 BLAKE2B 1e3fba4cdbe1c3d4f0ea56f8e54242e0276a3ae47e5dc97152d0afd7042a02ae9b57d6808ed8482358eb244eecc73ed41f7411ab50d4b462fc776b68c293c30a SHA512 97869a0271ae7f36a16e0a73eba3962fef96129bc33fea98909020127336b2cac54184cac1fcafacae2e4fa1fa24fa27dd68a2d43e4c588636782fdaef6b9fff +DIST linux-6.8.11.tar.sign 989 BLAKE2B 4a0f5f89f9009fc8aa9dc363832e80dbf897ea42107952d05d5dff849f2098e9b52ab49cf938fb77ce5b136b837e29a146db798ff2f8457ac303adc06d218fe7 SHA512 2e7066ac30a066e0c4b4672411d8adf0ca9a62c28470cf38fda84ec0a0eb50eaf5a48329c0eb8e4c957ae9708aa0c474d1573c282073bcde9a58ea122975f63c +DIST linux-6.8.11.tar.xz 142569852 BLAKE2B d9bf3665bff55b9242b24f9cce835056bad0abfd6ef998f63ee56418ee76a67ddf8bd5af1a1f02a4767a2af7a3f8c19f61f079e4991bdf4749fcdd04d7fdb7b6 SHA512 7885a8cc5b11eae67f48dd95d364a782f07fdfa4d2a843f7e2b009a266a1f200ef3c4c495e59710db40eea4fed5b7a5443c4e5f0c22f5fb442f87f44c7325549 DIST linux-6.8.9.tar.sign 987 BLAKE2B 0fc69e60bae77731897380cf929ae43785e0b7db7e68e761e53894b288a6a80fbf5ad888b5c0312f601a56984ec0b9206901d7c02b202e73dc0d19e17212c81d SHA512 18730f08135b06018d1f7757e1332dd0f20761363aa8bea7d49734a22a9cb27067b8052849cd2180299a4323786f7dc0bcd598536e8ce5e5042f2f841589daf0 DIST linux-6.8.9.tar.xz 142582332 BLAKE2B 0305b6636a4e382855a2804cedc3984f1e891b26b24412e3533b1f29a07459d39be5121d4618da20098623290e922d502b7ac1b774f39e732f23a778a4b5b5be SHA512 67056eae13be9130e11ea7e4d394d1f0b6b1dccc4f080f72c136870d4486fdebc2c315d149ca4f1e57af4c79dedf849e31c439426166544691508edafca3d350 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.8.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.8.11.ebuild new file mode 100644 index 000000000000..3161112ec95f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.8.11.ebuild @@ -0,0 +1,143 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_MODULES_SIGN=1 +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.8.7-gentoo +GENTOO_CONFIG_VER=g13 + +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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config + -> kernel-i686-fedora.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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=/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 + ;; + loong) + 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 + + use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" ) + + kernel-build_merge_configs "${merge_configs[@]}" +}