From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C7D11581FD for ; Fri, 12 Sep 2025 03:39:04 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 755893415F9 for ; Fri, 12 Sep 2025 03:39:04 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CAAC0110572; Fri, 12 Sep 2025 03:38:57 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C25CB110572 for ; Fri, 12 Sep 2025 03:38:57 +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 794E93415F9 for ; Fri, 12 Sep 2025 03:38:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E027F3991 for ; Fri, 12 Sep 2025 03:38:55 +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: <1757648042.a9d8a1fefa8861e4480a24645a3b321709d0465a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-6.1.152.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a9d8a1fefa8861e4480a24645a3b321709d0465a X-VCS-Branch: master Date: Fri, 12 Sep 2025 03:38:55 +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: 20b130ad-bfc0-4bbb-9d26-6dcea066ea7c X-Archives-Hash: de0475469d3f2b42a18c8214bfdfc4d6 commit: a9d8a1fefa8861e4480a24645a3b321709d0465a Author: Michał Górny gentoo org> AuthorDate: Thu Sep 11 17:05:00 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Sep 12 03:34:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d8a1fe sys-kernel/gentoo-kernel: Bump to 6.1.152 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 1 + .../gentoo-kernel/gentoo-kernel-6.1.152.ebuild | 174 +++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 64bca51d5ddf..d88f477d0515 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -76,6 +76,7 @@ DIST patch-6.1.148.xz 6365724 BLAKE2B 1f83c183389bbf4cedecaa22b49d6214d390f0cf92 DIST patch-6.1.149.xz 6456632 BLAKE2B 87dcff96ed8ab59b95ad6f1e7c297fcba14a62056b0797090c10f410ed39139b21b4282c4f8c3b8f37e9e37d3c50df3ba1418d5e6b47e77bddbafd258efdc0a4 SHA512 691a92329951a6df6293be89dead4728abfce0036364d69e76508cdd42ed98a23d82daad6785a932d16771e923a6e5dfc4f4cbff7cd35f371e473e76d6250237 DIST patch-6.1.150.xz 6465596 BLAKE2B 37dc4418a25e53ba22a893924bc4805a4443dd39801dda43f95c35bc7b6825ab1a2ae8040138353ed34fbf8bf84ab7df6e7fe83effa33e881ef75490dcbfe335 SHA512 c3cc0ed0829b1b19462abe03c37b345ebbbad8afeb2d150f88559a4d6d3929bed8fc4d855c3596fc99b10b5f6dcd21fcfaa57b53a1ac23c02aade0a73bc87353 DIST patch-6.1.151.xz 6483956 BLAKE2B f7cbc9fe2a300d211d27270d69cbac4dbe5c41b63fbae023473f5ab1cfaaae7899d4f7cb28e0ffebb454451aa04385e2fa9dd4d6b0d6a6f97a79272d7b1ed60a SHA512 036ace4f66ef3daff7e4163112b3a581107e345cac4bbb1b58788a5710d84724c3d7332ed5277aec5d8675ffc4ba4f0e85850dcdc365629fc2a23cae4dcc7ef4 +DIST patch-6.1.152.xz 6486524 BLAKE2B f9b532c867b2b5a15d28c08f89f9a30252b4b9d55dae069afbabc1f34eef570be6a39a6199e135c0cca18ede52accefa546dfa65342c8f6429a5b00280d1a56b SHA512 14fd84fc1f80125331940de767510a94735fce70f70cf71ef5868a46481ec146a2a6983af26935014547c90b84ff524a0e4a7341e8511fa18b92ae33fcd25a1d DIST patch-6.12.41.xz 2584360 BLAKE2B 8cb7d77a45e79b186e24bc59be15d74f4e9ea4b7c7f7b5c81b82eaa9b1a8b88a7aabff6768471d905e24539366bdb85593304365726307e19bcfa41937764bf0 SHA512 b9307fafe443eb61b0edc624b2c9ab7a0206765eb614683e0f01d7f7fab04a729a91d92d67b8ace03208d6b63088ff235203e8fdfad27adc97cdbf7df872b3c2 DIST patch-6.12.42.xz 2666304 BLAKE2B 7e8cfcb30f98202d7cf9e152be9ff31bb013b358f12817bca1211816bc008171a1e0ebe09a3c67c3867f5b194dbf818ad4bd412509e6a44a25f944e16c0eedfe SHA512 8b31be7c22a413e13a7b68086ac7f326d4741c2ae21dbd2ba3d62fc1b04fd393861b2801dbfd48dcf5b84651bc271434521b5e07876bd97afceae01034a7c144 DIST patch-6.12.43.xz 2759136 BLAKE2B a667414254b536de9d0158ceaf1e208241817352f237f914b2e6cb60091fa4db962d1d78b28d7131ffe967c293a06c97a056858b72d7710737d2c7f9fe1505a4 SHA512 44112176409936afbcd29690d4e097dc5a30052b9b6e8d91b293b51bcb5caca5e6f8fe998d3fd3bc9ed8f6ea36bcea05699a82a0bdd7f88e4a9a3907b6ae1d59 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.152.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.152.ebuild new file mode 100644 index 000000000000..f20e18e6f26c --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.152.ebuild @@ -0,0 +1,174 @@ +# Copyright 2020-2025 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 + +BASE_P=linux-${PV%.*} +PATCH_PV=${PV%_p*} +PATCHSET=linux-gentoo-patches-6.1.151 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.1.102-gentoo +GENTOO_CONFIG_VER=g17 +SHA256SUM_DATE=20250911 + +DESCRIPTION="Linux kernel built with Gentoo patches" +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/${BASE_P}.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz + https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.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/sha256sums.asc + -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc + ) + 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}/${BASE_P} + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug experimental hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + riscv? ( savedconfig ) + sparc? ( savedconfig ) +" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 ) +" +PDEPEND=" + >=virtual/dist-kernel-${PATCH_PV} +" + +QA_FLAGS_IGNORED=" + usr/src/linux-.*/scripts/gcc-plugins/.*.so + usr/src/linux-.*/vmlinux + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \ + sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz" + cd "${WORKDIR}" || die + fi + + default +} + +src_prepare() { + local patch + eapply "${WORKDIR}/patch-${PATCH_PV}" + for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do + eapply "${patch}" + # non-experimental patches always finish with Gentoo Kconfig + # when ! use experimental, stop applying after it + if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]] && + ! use experimental + then + break + fi + done + + default + + # add Gentoo patchset version + local extraversion=${PV#${PATCH_PV}} + sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die + + local biendian=false + + # prepare the default config + case ${ARCH} in + arm | hppa | loong | riscv | sparc) + > .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}/${BASE_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="-gentoo-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[@]}" +}