repo/gentoo:master commit in: sys-kernel/gentoo-kernel-modprep/

Michał Górny <[email protected]> Mon, 03 Aug 2026 14:32:16 +0000 (UTC)
Newsgroups gmane.linux.gentoo.cvs
Message-ID <1785767526.cae43772dc362b759f16d68604cb04c9706f920a.mgorny@gentoo>
commit:     cae43772dc362b759f16d68604cb04c9706f920a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 13:14:18 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 14:32:06 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae43772

sys-kernel/gentoo-kernel-modprep: Bump to 6.6.148

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

 sys-kernel/gentoo-kernel-modprep/Manifest          |   2 +
 .../gentoo-kernel-modprep-6.6.148.ebuild           | 177 +++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-modprep/Manifest b/sys-kernel/gentoo-kernel-modprep/Manifest
index d7ae22453aad..2b3c2a6a3a89 100644
--- a/sys-kernel/gentoo-kernel-modprep/Manifest
+++ b/sys-kernel/gentoo-kernel-modprep/Manifest
@@ -4,6 +4,7 @@ DIST gentoo-kernel-modprep-6.12.101.tar.xz 8902796 BLAKE2B ac483ad419a72b032430d
 DIST gentoo-kernel-modprep-6.18.41.tar.xz 9548232 BLAKE2B c97c7aa2c7dd42b5494a55829428ab65a8c02738f6944e43729c042b5c9b08f620c684ee19264f5799f4c33e5d5cb01f559012339626a95f39477174cde7a256 SHA512 03c071fff5db835621d0d7a53fd0d7e6ef35b0ca8cae19bff41c27cbb9776f3e19d3e2286936970fb3ebd7dde13e802c085260acde9fc568156edf27a59fc84c
 DIST gentoo-kernel-modprep-6.18.42.tar.xz 9559308 BLAKE2B 67f1c8a9804185aa7adf3e732142a82e925eb9959537bb48202390471968f58a902ffe510014433f47f2532c8ca90940f8b4d5018f93a07b18f733cef529716c SHA512 6fdfc107ae3ae73e191c8397b436f7c02e9c3fb25c87ca90a79af55339eccc7ca17b761b349acd24f3c510d2fc3847a789fd5678826e3edb3a2e44f98ecdfafa
 DIST gentoo-kernel-modprep-6.6.147.tar.xz 8247180 BLAKE2B 45b200bc0ec91d77bb89c433b08964e31c3e9c4ee8811764977ba01c2d07772b8f6cb6e258517f08dd65c9e95f98ec259bd23b6b6b156d17bd45eb9e196822d9 SHA512 fa1d34924bd8706bc2f2237a936d6cc553d284b7620b54c0fe0ca6bb429e5802aa7de81df1cd494be8cf1b84e0121c1f7514a2caf3af6e34071641ce59a1a478
+DIST gentoo-kernel-modprep-6.6.148.tar.xz 8252604 BLAKE2B 4481e65e19ed25591e56b94182d68331a011e781b78a52a94d16fc0d97bd777f6d796f37011462d3541084f6424472fe80c5b2184a29bb0ec8104e52a4f2e9d4 SHA512 e74a133c318c59689612623a5146004f0e44acdcd380327b795868d381a505ee0b8972bfa4b61fbc204f071d9778116e5b2556b929a87db2bc2c014c70702e88
 DIST gentoo-kernel-modprep-7.1.5.tar.xz 10033412 BLAKE2B 049e03b2cc00958fb60500079331e4464f3400a0a240807111a67b84f355466f133a4c3e9bc6a07856bf92499749d754a26adc869e6fd933b1bdf4a2cbf164e8 SHA512 f8242a91a6c286da3f328eaa92d6dab6c54449aff5b7593ed9474220eb73ac890fd211ce0cd58800627adc1e33498ae7f035ec214991fb208f486d0a5dfa11b7
 DIST gentoo-kernel-modprep-7.1.6.tar.xz 10047432 BLAKE2B 83a75630d3d5a91f1eb19630dd5eacdaa667ee631411c2b51a272b762d1f1b4723a66feed454bbaa05222959934d6b552ea5d9c224749b41344b87151985b668 SHA512 ca88c0a07b6ae801ab441c20210011cc6fab56870d46a843e87efd5df22f6d350bd7abf7062eeeafa48705d7fe33cc37bfa770adb497377e38b2f1715b99bcfd
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
@@ -28,5 +29,6 @@ DIST patch-6.12.101.xz 5441064 BLAKE2B 43c53214ad4455f2ef5fa618050f112a24c7e2d00
 DIST patch-6.18.41.xz 2796664 BLAKE2B 354c5ad7f53b85d1d3724b7d1571c2f7c202d83dd0ec4f005e8741b89e8e41fb8e93ecee4bcb1473588a55f610f131c557124c210d47970f3239fa24f9244eaa SHA512 10f64066a9c5cf297981e2df6eef31593b5c33f55546f3fd18733c55ac1607ad8e4229f538f3027fce27dda178bebd05bb99fd1b3d8a06e3e8f5b8f481c7087e
 DIST patch-6.18.42.xz 2994988 BLAKE2B b77b0cd3520e35d85918b234ae26122354dd33d397aa055ad259e85855c07fb8da2969e99ed5004434e1a1cce243aa6692422423dca70605049dda6ae3434ca1 SHA512 0705532d59b0e52ec0f26440af45e4535424a7328acc9384ba58fe2cb333351cb87b21364efd42dde21c9a8759057eb1ce8d97a995324dc8d2d254069281f4c0
 DIST patch-6.6.147.xz 6568988 BLAKE2B 764927281faa4332ff5a90877d613563cf478a82d6af871ebeb131fab3425eacfb756c9078e8ce4e4833d8e3588468bfcd24a8187ceb844251f411edd2dce174 SHA512 fce2fea6b3ae26ee6e66ef5167a4a6d3a6b3832283fca7d62e0d20af2b6b2dc43732b955143b8f1d4b8153aa27363e9cfab3caed647d6dcf4ac4f2b6deee80e3
+DIST patch-6.6.148.xz 6682312 BLAKE2B b3bb25925c38273d59b55c706aa7014ced04431f99afa754047226d443b8dc9e3c43803fd90ec35f668f52e4af13a696effe429b11416ec3ae82c8b081b661d2 SHA512 9e0c96476c19746770a1bf42aed8579ba9685f4e73bff66e898a656b9b5909ddffefe9a4a2d6912e3714fdcad337195c4c16fac4bcf719ff558ba0b50ad9d2d7
 DIST patch-7.1.5.xz 882648 BLAKE2B 484bfd4ae3ee5eb7da2cc8a58138c1c0bba966fe99e8f47603ca3e5f8de50c470301d19ac69322e73d52637e00e73c50c863d77a442fbc2008a8221ac76e3cbf SHA512 fc3cc487e2a633b9c2f0122a2dcdc3e515b4ad433c72372d7cf489b2c60ac186bc6b5ba9a1a7ea40683a5387c0300349ca6873d2938dc4ed2292e77f1743e01f
 DIST patch-7.1.6.xz 1102916 BLAKE2B 3850fc2be353ba0d5936a755c0ef9bde19067cc5cec57075a5875ac136c8813a79d3ab3213ef314d14a0a312c109b404cc5580b6dae172b846a104fcd083b0a2 SHA512 b0781089712ed4e2569a95bc22d6dccd5eb138b9c2810281b0793525889b671495b0b3e9d46956ffed854f17743258078ad921a62df84c0f316bf5b44f6c1c35

diff --git a/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.148.ebuild b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.148.ebuild
new file mode 100644
index 000000000000..c7c15eadf892
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-modprep/gentoo-kernel-modprep-6.6.148.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dist-kernel-utils toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.6.145
+SHA256SUM_DATE=20260803
+
+DESCRIPTION="Minimal subset of gentoo-kernel-bin for building modules, for containers"
+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://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz
+	https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/modprep/$(ver_cut 1-2)/${P}.tar.xz
+	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
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT=${PV}
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/libelf
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	app-alternatives/yacc
+	dev-util/pahole
+	virtual/libelf
+	verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist-bin'
+KV_FULL=${PV/_p/-p}${KV_LOCALVERSION}
+
+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
+
+	unpack "${BASE_P}.tar.xz" "patch-${PATCH_PV}.xz" "${PATCHSET}.tar.xz"
+	local pkg_arch=${ARCH}
+	[[ ${ARCH} == ppc64 ]] && pkg_arch=ppc64le
+	tar -x -f "${DISTDIR}/${P}.tar.xz" "${P}/${pkg_arch}" || die
+}
+
+src_prepare() {
+	local patch
+	cd "${BASE_P}" || die
+	eapply "${WORKDIR}/patch-${PATCH_PV}"
+	eapply "${WORKDIR}/${PATCHSET}"
+
+	default
+
+	# add Gentoo patchset version
+	local extraversion=${PV#${PATCH_PV}}
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+	tc-export_build_env
+	local makeargs=(
+		V=1
+		WERROR=0
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir=( "${P}"/*/usr/src/"linux-${KV_FULL}" )
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+	local pkg_dir=( "${P}"/* )
+	local kernel_dir="${pkg_dir}/usr/src/linux-${KV_FULL}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+
+	mv "${pkg_dir}"/lib "${ED}"/ || die
+	cd "${kernel_dir}" || die
+	insinto "${rel_kernel_dir}"
+	doins System.map Module.symvers
+	doins -r certs include scripts
+
+	local kern_arch=$(tc-arch-kernel)
+	insinto "${rel_kernel_dir}/arch/${kern_arch}"
+	doins -r "arch/${kern_arch}/include"
+
+	# Add the identifier
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${ED}${rel_kernel_dir}/dist-kernel" || die
+
+	cd "${WORKDIR}/${BASE_P}" || die
+	insinto "${rel_kernel_dir}"
+	doins -r include
+
+	# remove everything but Makefile* and Kconfig*
+	find -type f '!' '(' -name 'Makefile*' -o -name 'Kconfig*' ')' \
+		-delete || die
+	find -type l -delete || die
+	cp -p -R * "${ED}${rel_kernel_dir}/" || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	cd "${WORKDIR}" || die
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die
+}
+
+pkg_preinst() {
+	dist-kernel_update_lib_symlinks
+}
+
+pkg_postinst() {
+	dist-kernel_update_src_symlink "${EROOT}/usr/src/linux" "${KV_FULL}"
+}