sys-kernel/vanilla-kernel: Bump to 6.1.143

New release using base source tarball + upstream patch instead of fetching a new tarball for every release, to reduce distfile space and bandwidth use. Use sha256sums for checksum verification. Sync architecture support and QA improvements from sys-kernel/gentoo-kernel. Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-08-24 06:48:18 -07:00 · 2025-07-06 16:18:37 +02:00
parent 593c59bd1c
commit 9e2cb598d1
3 changed files with 162 additions and 3 deletions
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -43,6 +43,7 @@ DIST linux-6.x-sha256sums-20250706.asc 154698 BLAKE2B 8c9f6fce58842bff04a7e67bfa
 DIST patch-5.10.239.xz 6751008 BLAKE2B f3acc8f5466fedc9d4aa5307067d3b0a2c061bf8df512919e69b8ec9b7aa2212e57b22ec0f41f5ab69be9af26947def48f2f5c475f285f331f2a9c5d670fac1d SHA512 0a4d316c5e7de0827ebe071943aa67ddd8f7f04400a209969fafed39eb5cfdcd4b427034b04f340c4d889b5b87d85d5e75488892fe9bca0b13329668e33ed94b
 DIST patch-5.15.186.xz 6915404 BLAKE2B 889614a7f12f423ceb961537ade85e339dfe8984fc19794ba80f7dfe1e3f26af62e58925291df700533c47d3e4e5018d5fe940ebbc429d1013ff4205751601c9 SHA512 5ca0df20992706d5a7a1425bcbc137aaef9abbb23bdf9d35375aeaa952b85fb6d262aaa858605c2dd5797f1e1c3af9cdff4fdb3c2acba9965efe7f98400189eb
 DIST patch-6.1.142.xz 6246892 BLAKE2B 4e2f25b204d51b618c988e8cb185b7c5990f0ce42af4f73597bf184012e27210bf503493b520d0a795ce1a531294c01ece34ab6de9dfa2fe54bbeef267b07802 SHA512 08091dc3115334bbff7ce4f5ece794fd0f044e78b6592c611a4e6081e6f406f08605c21ab657dc8d63fdb75388c137a947a3afa521e2a486ace34b09e88a9e7a
+DIST patch-6.1.143.xz 6273416 BLAKE2B 698b97f20d581e877f9c3c71fcf0bd419c381dd7c30a289d23503ea34d63d1b303087333b31059e908c6afeb3a06febdf1108cc62c52fd6fff0913124b76305c SHA512 5894d379a59d9fbb4138736a27f755ea18f1520e7b3f6329d6cfed7c2df1582c9cedafcefacf3733ee3b6e2de2e32fd940fdf38e6704664e3bc5c8e227547de4
 DIST patch-6.12.35.xz 2323488 BLAKE2B bfefbdc9bcc7b6e39f5d7e60778794b3ba5b3811d33828a9b07f91b672894ae7be61829673c0a7b000762b50d740108584619cf3e2abe14385e9f3313be493f4 SHA512 30c49515ce8e7da45d29c027348f7a569cefd49f63e1f0468d1f4ee0e2de119cb515be40d816aefbe79e3f937672e214b6fb1bcba2a953ac0b0811f8a4585c08
 DIST patch-6.12.36.xz 2388056 BLAKE2B 9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498 SHA512 4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f
 DIST patch-6.15.4.xz 453596 BLAKE2B 8f1fee18f5f522c93ddbf1608f432bf43d3662e137cc5e9c9ecf8da626732ef448ad14a1714c29b1abf341a2e1ab8a22de76a8bec4dc552f39b04585c42bbc3b SHA512 341e642a61563dc1ffa4434f27fb91c09f70c1f116b54b2c5bc855e88c2404cbb9f983dbf3f7adf2328c29abb0a5c5dc88056a5c782820b94045a865b959fa12
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.143.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.143.ebuild
@@ -0,0 +1,148 @@
+# 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%.*}
+# 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=20250706
+
+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://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.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 hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+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 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="-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[@]}"
+}
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.9999.ebuild
@@ -3,7 +3,6 @@

 EAPI=8

-KERNEL_IUSE_MODULES_SIGN=1
 inherit git-r3 kernel-build toolchain-funcs

 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
@@ -45,7 +44,12 @@ EGIT_BRANCH="linux-${PV/.9999/.y}"

 LICENSE="GPL-2"
 IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"

 BDEPEND="
 	debug? ( dev-util/pahole )
@@ -54,6 +58,12 @@ PDEPEND="
 	>=virtual/dist-kernel-$(ver_cut 1-2)
 "

+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
 src_unpack() {
 	git-r3_src_unpack
 	default
@@ -66,7 +76,7 @@ src_prepare() {

 	# prepare the default config
 	case ${ARCH} in
-		arm | hppa)
+		arm | hppa | loong | riscv | sparc)
 			> .config || die
 		;;
 		amd64)