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 6489515808B for ; Tue, 1 Oct 2024 03:07:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78BF6E29BB; Tue, 1 Oct 2024 03:07:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57A48E29BB for ; Tue, 1 Oct 2024 03:07:01 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7632A34300F for ; Tue, 1 Oct 2024 03:07:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D41CF1F2E for ; Tue, 1 Oct 2024 03:06:58 +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: <1727752006.a29c4338295eca1f62ef710c63a326c13170ae62.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.10.12.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a29c4338295eca1f62ef710c63a326c13170ae62 X-VCS-Branch: master Date: Tue, 1 Oct 2024 03:06:58 +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: e10443c0-ba23-43d6-ae99-ad61dc0a1fd8 X-Archives-Hash: e0af8e0589c028bb8ec26667c6573a63 commit: a29c4338295eca1f62ef710c63a326c13170ae62 Author: Michał Górny gentoo org> AuthorDate: Mon Sep 30 17:49:54 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Oct 1 03:06:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29c4338 sys-kernel/vanilla-kernel: Bump to 6.10.12 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.10.12.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 19498746369d..7c94ca1e15f3 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -30,6 +30,8 @@ DIST linux-6.1.111.tar.sign 991 BLAKE2B f65cdcfcde31e4e281af4f6efbaabaec9f347d1b DIST linux-6.1.111.tar.xz 135180332 BLAKE2B 4e60152884277015e12e9830da2fd4816507e36fc263506d270a17bb641d4811c83ea358c7fec0d3204a02b5cc3d47c3a935a52a4a5ccec869a96e458ff86d89 SHA512 239a37cc75c6f19d9f8480cc1fed27e885a60b1d68b127848d3e00ed6e2ffe3fe5d9bea0ada95dad1e39c6e829446f10722b2d8ab062f85aab189ee74512ca9a DIST linux-6.10.11.tar.sign 991 BLAKE2B 45a05ada9cbe48948bbf1cbd581eafa6ace4f2b1f9b8d3dd0d6059f6120ff15ff55e0b1a74d3819105294e8abbc1be2c8c806e4c9e04f69cf5e7e6bed80ee06b SHA512 f9ae418c735b250c55444634375dc9bf5481f2709fb70bb3f3b939100325274c60ee52fd3e2294b1277d9dda2e3bc5574f3c867029aec2e4a414f5b40ace47da DIST linux-6.10.11.tar.xz 145185812 BLAKE2B 55380d2af9fc535f6359cdb9b36612d1f81f2f140652f44bf927c320dda382109c9fb9591cc741914d3221e8d8bda954a10dbbeff8c163bf1ed57eff1831c8df SHA512 bb118bf74c0fd613e55e84f849849124f1d6093cb57c178258e2210e400e9fe492c16578bba583b1434b65175ebe1f20dfb722c271bf71b1157d38f3c0b2bca3 +DIST linux-6.10.12.tar.sign 991 BLAKE2B 4e48b45853b4a486d0bb6c4357c2df3f9ef9c26d4cf50299e5998b6aab84057da6d095f222a59bea86e65012029960195f48006c143805ad7e1442f10d8ca636 SHA512 5fd50b4e3252a69b8159afe8ee536b0dc143fe49f2dd98f8ff05c8b0e52e2a1dbf5d20f15fc370ef5e47904deb4dffeb1b1021d42b59b2f9ec5bbc3fd17833f6 +DIST linux-6.10.12.tar.xz 145175356 BLAKE2B 22cb2e7c59e65da55f1db0678f3e913376d343f8285666bbc2c4e6a2b1b45c492c8d01a10f9a0ab6f944745a676ed7da9270683d29ca4984f68c86f965dfe121 SHA512 735720dd392a50a3b625f8e095f56c4c3632996883fcc80d7bf864c122c7417fac056295740fd2c5c9d3f77e75cfc1e7cd988566b3e32f64366e90c31c4ee9b1 DIST linux-6.6.51.tar.sign 989 BLAKE2B 6413a28f43c12842b24a6bbb3def5cdff4776ddb773afe71d13f987212e8247b721599f24fe003585f85402b39e175a223053d47871603ab5878b1caa9a13f1d SHA512 0eecf63ad8f3c20edef379b90e9c7b576457ae5dee6cf265bbc7bbed1e46f6fc33fbbdf437497edc3ca821349762f97d8b2a11f249fc14ecd91c4f7002528a66 DIST linux-6.6.51.tar.xz 140337048 BLAKE2B 11c628d94cd62e08ec500fd67fc8b989e03cfa617690f5f7ce010f211c7778c7b57c119d827a707b3c09e862b5b96de3eb8e503b7128a4e1651789e4420ac1e6 SHA512 c79fcd957dbc855e101464a04b33921ab0dab7bf16201da0cd49b4c3dc9746f22a7f3411033035698ef98e8c9bcc6edf560e44c2b740235beac7cd59a4ea695c DIST linux-6.6.52.tar.sign 989 BLAKE2B c3ea21b0921eab9df4fd36ee10ba4f417ccdde013be1d4a75c28e50578495812ec058a51bbbefdd9baf9b5fab97ee1558c6bb9ba79172750dd89ac8494f5913c SHA512 a19d1283072c8a648b02765e9ac94284171a1376e0a07fd4872a32c565e5d6f213cf38af636475c46e9369bf45c32971ad60afaed3c2ebe9d6e6614fc9731d5b diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.12.ebuild new file mode 100644 index 000000000000..8b28adae0b64 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.10.12.ebuild @@ -0,0 +1,137 @@ +# 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.10.1-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 -xf -)) + 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 + arm | hppa | loong) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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[@]}" +}