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

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

commit:     cd6ab6084c059cee01fa6d891edf41cc0733bb4b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 17:34:30 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 18:34:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6ab608

sys-kernel/gentoo-kernel-bin: Bump to 6.13.2

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.13.2.ebuild                | 184 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index dc35cd50cb0c..82f7e24652c5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.12-15.base.tar.xz 856536 BLAKE2B dba6809d63e9ff073b40a08afdead
 DIST genpatches-6.12-15.extras.tar.xz 4056 BLAKE2B f3b21174d15e3ee9f367ddd10745e1812b2a7573dc618f1c42db7afc9794208fdb67f62e2f400a144ad2f6d050b0419d67152c10af83ca263ba210bd8d939972 SHA512 7a5460091350c279519bacbfdcc83ee69d14364c0a8b5c192b244695196f72ec24e27d85d1f87608b1af6e9adcb5089ffb079c3e5190b7580833a438a2672c32
 DIST genpatches-6.13-2.base.tar.xz 15268 BLAKE2B cf7b141b036ce1f324e59a2a159cf031e05242dc82f56f65f280e93650c879c35fad3906b680394741a8582310b7924cd09e0b48887130e39ef713fcf4c513f5 SHA512 058545ff09be7f54889b691abbface6579a3f030830115a06c15182d1a92ff5e566b4989de65ec21c57a233f792b973408f8405fb33d020939b06ab31f3b1449
 DIST genpatches-6.13-2.extras.tar.xz 4056 BLAKE2B 87dabe3972da098d4491f83189fa2cef15d7212800f4daad3bb248a0895112def3ceebe5c6101eea3832eef329827ca53e2c0fbc82febac0158a461ee59a5b51 SHA512 526d45b794e14a6097e25f1a614680a76db07fd6c423362fd38378986f29fc139557573ad61fcd2a2f865cbe2e575528fbf57a04f2b5804f84fe89f284ca8c07
+DIST genpatches-6.13-3.base.tar.xz 206716 BLAKE2B 8e5b254c09e81896cf6228cda82228d055ed3b6c2ff27db2af4c0c1abca6dbbfffad64a52e864ee5aed5244979dfe4ec5c27916c62021816cc25cd966f1c843b SHA512 913f79df9a918146d447a7862d52ce14102a66b9c3112780e182de61ae45b867fca25c4e286dbe1d9e8b6922fda07e724d8784b47d378015998dcb42ae55c88f
+DIST genpatches-6.13-3.extras.tar.xz 4056 BLAKE2B cd43af52aff7f3b5bfb46f3b2f2df0b421bcd33aa478993115e9fe58205f4b347e722bc5f14e9c8b1a2a563db987d335a993dc5293fcd972b78a5a258c819b24 SHA512 1f2968091cba801465a74c58f0d265ae7c53d4f4e03c0369ddb4d9c855783255a404d4677c9a3fd06a8a820717562e2f2ec3ff31d126b0243909c29a3175995f
 DIST genpatches-6.6-83.base.tar.xz 4270596 BLAKE2B f94c4d0387957b4384a893f37bd232eba24dac57fa73297f4c25822c2aaaf6e9616c402624e43daab655c31677a59129dc853914fe9817125281ed40139b0bc9 SHA512 7479e6ffc5e736cd36df2a3f66079514b016059a273ef92d2e120f8da050c0383f8249dbd9f45daa1ee192117942d339b0bbe1a6afb1eae6e118b483fddbb8a2
 DIST genpatches-6.6-83.extras.tar.xz 4056 BLAKE2B 5b28f9a1750f3aa6dd30c976f1ae8431a93d44967c52dab2bce6b3cc17c75c063ef675765da94a212eab94dc64d144283049570d413b5d7acffa7be207249557 SHA512 27a91748aa74628c3fdb78709e39166858280a4cd80f4d3241e96158d1267b79c0a6a3cbc9b70fb7ec9069e6c8c7f7210efa174ffca4aaf3234ec34083fdd61d
 DIST genpatches-6.6-84.base.tar.xz 4282452 BLAKE2B 86b6018d06d2d16087af80a717b1b4240fc422dcbe9e96bc76c8ce98de21f1520e652051d4821abb7985df9ad5b760bf9ee2d2b00fb91736912e85d8d457b4a7 SHA512 8f2b431877399295b43af5b0c8b314dd9b00dcc3e62585da4c05a048118393e65933063c49e6d346a550e7aeaff49a841a4ee8378266b03b0c880f41319c9b5d
@@ -56,6 +58,10 @@ DIST gentoo-kernel-6.13.1-1.amd64.gpkg.tar 302438400 BLAKE2B 9332494e18e9e19df2a
 DIST gentoo-kernel-6.13.1-1.arm64.gpkg.tar 278824960 BLAKE2B 9ff3d775aa63dfed2c318ef7bbca39647414ea667cc2b5732efa97900a896b0cc8bb03a0d538eb51ba9bb6a1ef48f6dd2f14590a225715e2a7309f1712b89e9d SHA512 d115eb3738ac79f2227c580affe90c7b0c89b623e2de6e1771cf599825fc650fdade345de794c543e5b96c7c0eb980186551ae1773d0ec396014a8c6f89fbff0
 DIST gentoo-kernel-6.13.1-1.ppc64le.gpkg.tar 73164800 BLAKE2B 3266957def06bafc2b2740c402bd59902731f6a0b173f570eb575fbad33ac6cdd52a35eb6984c99d2e5915934b06626ec07c0e91871e8d913febcf2d0305d049 SHA512 768cdeefa7bbb8bdfdbe1a6c0550beb6a4896688f194bba1a81c319f53bc263136581620ebe43ecd09a83b6a5302fa1e7e2333d6b85c82f73747d221e766d2d8
 DIST gentoo-kernel-6.13.1-1.x86.gpkg.tar 77496320 BLAKE2B 5fe8ee8778390963182575617828b2b3a9f43bab5d8d7ab85afc2b2596db1b4cea5ad23383c45a2eaab3e4b7812fbf28745b316b99a3ed4423ef2e1a557a9a8c SHA512 586085ff0f614b6dd97935c73943c533980de3f9271ef9b3d6c4c2103e816c29ec4b690374099e08973b0b4e3a173911dc96cd4d2cccb410bedf71e00e6313fc
+DIST gentoo-kernel-6.13.2-1.amd64.gpkg.tar 302581760 BLAKE2B c871add0ebfc7cbec4ff21d3ad3480cf5832c54f5ddbb921b39ae9b318a8a1b04231de7fd60fe9fce91205ab3ecce83cf7b93b13111d0ba0d48710c3c935b9cc SHA512 9f267f3a3c09338956d37a3f6f1025acf814b15f23771ffcd5c6f72a0063b294610b1709686bd2a435ffc02a9f88413ad4b8b46ffbe69899cf4176e382439c7e
+DIST gentoo-kernel-6.13.2-1.arm64.gpkg.tar 279203840 BLAKE2B 4ab544f394a5ac5ab448dd4208d2ee793645b1f5889a5251296845f13bb6abe2ea89d36016c4309d3c58ec985768de5f51712cbed82f5bc12f87aab38663e4a9 SHA512 a14b7264c45078331d89ce8b56b8ba9b8a1e97ceb4481fcab269b53688d6252849575cd9ddf3bbe82999f79b3844cee7e241ae8047af5a534bd788ea29665216
+DIST gentoo-kernel-6.13.2-1.ppc64le.gpkg.tar 73236480 BLAKE2B e8d8bc694a6c645572a964769e784a5251e273379c19b68c0c36e7fb32a789c0a48f55d60706998b4481838070ff5ee85ceb545867217210385a220ac4baf721 SHA512 988fee69f31246692a92f13696e2fccf09f9bbf1b6866b224d78116d0d5956c2f2eee0d31020bf573412dcd3c943056fb3299a65f02fa743a888058543cfe933
+DIST gentoo-kernel-6.13.2-1.x86.gpkg.tar 77619200 BLAKE2B 99a98bd8ebe2882b95463e04270951680b0392d455ec7781774d456e0307bc6ba761500e09ff96ebc109ed6c29bcdb019b283062bb27dbeda4472dc7d2fd24b0 SHA512 c5d5ed7cbd48357a1e8b2a19f448b37f71e7756ea71832beec4a093821370654033a5122ffbe968810ef7e4141cd038a89b9c06e5ed6677ff13740af7b1666e2
 DIST gentoo-kernel-6.6.74-1.amd64.gpkg.tar 270028800 BLAKE2B e74b3ccc5ba74a5138536eeaffb699cd7130b6e05fedeb4e85464def2eca67e153ddcc61a43be9eb6c46b402024411578b3abdebba26d4cca3444d1e84e7fdd6 SHA512 7dd5bdc97bfb69ab6d859d52823f737430d4cb5d16f20dac7c081706ea49b05de6dc4f17d79a87666133c45220e5d02f82255e7e469feffe0aeb3b7775257ed3
 DIST gentoo-kernel-6.6.74-1.arm64.gpkg.tar 245944320 BLAKE2B d113815afd6a696630525b13775d625c33f087c5c6fa817149b478b94153414eab8f413b236144b3989a043329b82c0f79f38679e1e6d65fab7c8fa4fb15ba43 SHA512 9f855f1882e40a1b596041c1370500baa1119ec3e4987ef500487dd87f62c1b6527eca4b23df4001cfc167f9375101ec938f783d717460ecff8fb218c371bbc6
 DIST gentoo-kernel-6.6.74-1.ppc64le.gpkg.tar 64409600 BLAKE2B 439c66dfb35eaf37b5f21d7a36f728230861cbf1fd3e4e7420af87ca2d8b45fbbf0b730ca17670c513b4a7bc060d5e13b3f99db35df4e8ad619940bcb4886ee5 SHA512 673bc0a287737dca8079466e1fe2fb1f07d19ca15f05aa4c5537f49dfd486d7ec73172025f43d8474707e48814407980b0b842ec410257241b5710bc169074e6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.2.ebuild
new file mode 100644
index 000000000000..c0377f141128
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	dev-util/pahole
+	virtual/libelf
+	app-alternatives/yacc
+	amd64? ( app-crypt/sbsigntools )
+	arm64? ( app-crypt/sbsigntools )
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+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
+
+		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="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local rel_kernel_dir=/usr/src/linux-${KPV}
+	local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+
+	# Mirror the logic from kernel-build_src_install, for architectures
+	# where USE=debug is used.
+	if use ppc64; then
+		dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+	elif use debug && { use amd64 || use arm64; }; then
+		dostrip -x "${rel_kernel_dir}/vmlinux"
+		dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+	fi
+}