[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

["Michał Górny" <mgorny@gentoo.org>]

commit:     46af3386d9b0e623673a3aeffcd5539fb4a3c124
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 17 19:19:19 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 18 03:15:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46af3386

sys-kernel/gentoo-kernel: Bump to 6.1.146

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.146.ebuild     | 165 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 0461bb4d661b..006fa3389338 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -74,6 +74,7 @@ DIST linux-6.x-sha256sums-20250717.asc 158429 BLAKE2B a66d65f806c583b804412324fc
 DIST linux-gentoo-patches-5.10.240.tar.xz 19396 BLAKE2B f61ba4218c2fb65f3e67b7c3480936fdf00edf8e278554d5aae81ce7ac71c8f8c83f7b71dbbd679ac2305004c847b0a11670b59b137fb11cf77c4d0849ddfcf8 SHA512 3368213c927b3d672490d0af3653dcc8d8784ea165d70a6eaf3fdacb936637a67a07de4b3a06a06eeb42109a083bbf82c3a5a03b1f98a2d240039de6ff704d7c
 DIST linux-gentoo-patches-5.15.187.tar.xz 8636 BLAKE2B 64db6ded446586a589fc36753258ec166cc1260b95fa43e7612f0e5f3f831668dd81c5ec6339bf3bf2dca6228c624cf114ae9380290eddb4acec949f84de3ca9 SHA512 b18fd19031ad2f8078ad37cd654a6dffccbe53cec1e0c008ff56c5088a32c7c87895cc00be64d79f5252e842ba757a4e6681a09e5d0ef2f986c9d67666eee81e
 DIST linux-gentoo-patches-6.1.143.tar.xz 27676 BLAKE2B dc4a08be01c737a3131c0ac11b7697d025cd3cd90a411a2f883b615757931c0dba9c2b45a3ef9c33bf17e36c1ac9c14a9b8f3a8243a599edbab2ac72f3b36f1f SHA512 c2e4e885f98c9d87a9f2725697ac757d50bf7c881db6c1a992f5108c10b0922f08739857372d78dba745240f9b74555fa2bea095e25a9827bd3a76c0eb3cbf87
+DIST linux-gentoo-patches-6.1.146.tar.xz 27676 BLAKE2B 214c191392ac219a9d380f34727bb07bbeaaf87c0d67b3315ecacc30e5a6a177df3dcc077e68e5b1d32c17f2d2e1675fe289b637c3ad287a0012dde1211b5da8 SHA512 a0bac906c5d505363946410e36c61b63cbe48ae2f7f7613101c10d2db20545d922d6f19e6cebd5ff363e8b799cece47fc51a748942a06fe46099d5c8dcf2e2dc
 DIST linux-gentoo-patches-6.12.36.tar.xz 17848 BLAKE2B b1257367ba4d02ef5f1bce8846368badd80e27f3eef8bd0c6f906478e0316b29be4b0b8ecafc550cffa82fef78c656672faf74682edb8d6ef92e80ac5e0d8c20 SHA512 c84797f87077964699edb5b7e34682b99d6fa4278d177385a6d78f7de409ec46eeaf40917443003f7bf5453fbfe608e28cbb05553c27656a0267e6421988790c
 DIST linux-gentoo-patches-6.15.5.tar.xz 83692 BLAKE2B 0b0831734f25b00a3523592439625342d12b0361b56e4d8243f94c045a27eeedbc02086032f01240d26807721d55d8a4011513b5610d1bf4889e35b7ac171afb SHA512 876750fbfb36f75ddb69026563a2d43310e116c567491a5428da30383a38d9384b97455c7ea61a1faa949b44dd22f402262c63a3701568ef3f8ab2d5f67f6c0f
 DIST linux-gentoo-patches-6.6.96.tar.xz 41508 BLAKE2B fd1a612b4376ffc7b916dba5c1f7b7d54a2f7724e96b44fbb1be929ff09868414b2462a37dd57f06960eba3c981088880ce350b1d5a1def225482bbb4f1e6971 SHA512 913ea1723e814930a7f78bf46cfc7d677a4f574f3e1a17b2a2af4075e86ce3d88de59cc1884dd2e8b49975dd293ea190545040b9b1f430bd74d37b88e58b9a21
@@ -84,6 +85,7 @@ DIST patch-5.15.189.xz 6955776 BLAKE2B bd2bf4ad70014395ffac8874434b2caae7823b1b9
 DIST patch-6.1.143.xz 6273416 BLAKE2B 698b97f20d581e877f9c3c71fcf0bd419c381dd7c30a289d23503ea34d63d1b303087333b31059e908c6afeb3a06febdf1108cc62c52fd6fff0913124b76305c SHA512 5894d379a59d9fbb4138736a27f755ea18f1520e7b3f6329d6cfed7c2df1582c9cedafcefacf3733ee3b6e2de2e32fd940fdf38e6704664e3bc5c8e227547de4
 DIST patch-6.1.144.xz 6289876 BLAKE2B 62ad271691df8040404a2f64de668f7a2488b176e4dca515f623d3c339bd3b595acc44e29a7ad62d5855d760574ec52d726b8758f2381f71e3076f5c7b8544a0 SHA512 e33de7e975200e1091ca3f31ee6cca0f2e4dadb3afc1550bf415527a1741109d8d6e67d23bfd928949ac31e49a4a0175f27ec2dcc829df14c5f3b86751ba0568
 DIST patch-6.1.145.xz 6289404 BLAKE2B c076fe18a597abd32ec98e2cbd64971ce1ee39395a54928f6d358e1fbbfd8a3e7b0679232bb8117b230df2fbfa1c96459c8432fbe84ffcc3d926f64d99f5467f SHA512 85a8e0829341a367e5d0d4640064083b01b64f32d9b0bd1574d5d3fb4a4d4e67e80bbb06ed40854573d5651a235ed205aac66e26725146aa269894d8e437b1d1
+DIST patch-6.1.146.xz 6304812 BLAKE2B 9863e30d45849ad733e500c90958d63210adbd46690a8a0e1688a39bba6337ac38b777cba8f63870159a47c191bae188919163cf081bbd44f197f2f3a28f76d8 SHA512 0ab0a0f42ae4c83fd440ff26e822de1326980372a990d3eca2b3247462ee2b5810de00d9e3fe9cef5bd58d5a9d968971325e255df1569d5d6f66572c816e3e81
 DIST patch-6.12.36.xz 2388056 BLAKE2B 9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498 SHA512 4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f
 DIST patch-6.12.37.xz 2489896 BLAKE2B e269f015f0930ab9ab73f3ab5ac6ba5d4b5e240399d613d332207f2c07593d7540faa20c877c0cad9bb3e9870f7b48e17c09190b193cd5241ef7b72cb98ae230 SHA512 a03eb5b8f944faaf3757cc5ea980d8abe5f7442a4ea81d55264cb5fdace735f2377ab99c8d975e8c31bda2a9df63187508166c3dc2d29ad1e95bb30d925f9f01
 DIST patch-6.12.38.xz 2489864 BLAKE2B d19f238739698d9696a5d1f6f7d506dfd60163532110dfbb5e32e6c42790dc7ffbd79f97e6ffa22b276854081f0d7c2ca3792dbe53bc75897852fc4ae3b473f8 SHA512 ba24b744a5ccf441234b59a274d6f7d62e082144aff05f4e7acd0cba7c36e969536073e9884398a25e113ccbbf6c938d1e6e068e8d029a8650d7b62788c0bf58

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild
new file mode 100644
index 000000000000..21a6081c2e6c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.146.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2020-2025 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%.*}
+PATCHSET=linux-gentoo-patches-6.1.146
+# 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=g16
+SHA256SUM_DATE=20250717
+
+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/${MY_P}.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/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}/${MY_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-${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 "${MY_P}.tar.xz patch-${PV}.xz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+	eapply "${WORKDIR}/patch-${PV}"
+
+	local patch
+	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
+
+	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}/${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="-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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}