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

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

commit:     ebb0333d106411047a922033c6b7e66a45708ee2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 19:48:17 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 25 19:58:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb0333d

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.32.ebuild                | 161 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 612b059a6852..6f01c56812ac 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff43446
 DIST genpatches-6.6-37.extras.tar.xz 3736 BLAKE2B e54e5dc4b2cc854dbac9fc0d03dad93cbe4aa639142090271abcc0e797ab28e3377986f46767df8d6802edaed058e1b3999067c96d05ec8bbb42f48e33f96cb6 SHA512 be6299eedccde2d9e4cd37d4df14ef6c6a404892f18c40c4acfac31dfd20f1f0c28be767fccd8a7ee0817b32490057c76fc01d895f979686ade5a0357a59515b
 DIST genpatches-6.6-38.base.tar.xz 2066552 BLAKE2B 61205dc2b5d17f15af23d8eb8af0720fe5f6c560ae671c98252d7c9e28e9b93fdde067811664f095ce103beab9bcb1810e9ab9e32a82d972cbbb44ce5257f097 SHA512 ef6d0814f5bd646c49e54fadc46e73ef118466978a6fba1bd18d832e6dd089a1699ec14f40e769e061bdb84f843e94c190b31729b48a36a317d66da6a8d00622
 DIST genpatches-6.6-38.extras.tar.xz 4052 BLAKE2B 7d25eaaf329cc043fd5189114c5d100f2a3dad9a97b0c87cfc9541ff95ffeb9e3a8a723e5c4fa1f9241c4fd67aac5aa1e4aba96f5cedad5609463b96bc272da7 SHA512 d5957d7ca9718bf87621fb4200b5bbc4e1457fc7fda1500714fc88730a4dfd4dce81e386bd2a2f88e02aff16c46e35402421439e6393a5ad15848d26d9056b44
+DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1cd1ecfac87ddaaee1ed3213f36bedbe4441ecfb062abebd1312572971e9cc9e5a0e8d3e16c7af98862b087906d61fb4e1e10 SHA512 6db496702e671459f3b054ce7068bfa48fc3b2be6bd3cbc3b158f7d4e0a2fa2310b875e46d233adea870775358e6e9b4f19fe8940d146575df9a41bfafeb1ded
+DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91
 DIST genpatches-6.8-12.base.tar.xz 687664 BLAKE2B 3c27ee511c258f3659d7f8cd5b6d470ffa10a2fc95bd536b272e0bb20c368dfc8c512f23fdc025e85ad90d6f628a58c80d8d15ec0ef8898caf7461162cf2dec2 SHA512 cd845b49341366190834b9782c9ffa270608a35e616ff483b40094913f6d01809421b80a7830117b606e57e6bb0ed9b0ed6dc14220826364fc9d2ee6a5916ad6
 DIST genpatches-6.8-12.extras.tar.xz 3736 BLAKE2B 15a15ca3097dc42ac5855e59fe61c961854c1afa8adc719c761ac58bb7c869d3240c228b0963a91927a9bc0af6998b4c40e4d286faf7d2defc2f21029d11c114 SHA512 4f1c8c07e81c0d1ed110bd4512d2a16c3e202c47d8ab6bedf5213cf6c2f8675e9b543e52dbce50fbbf550d88252e2c1c19c2465ddd7907f11a2979fa92466a7c
 DIST genpatches-6.8-13.base.tar.xz 781972 BLAKE2B 7e8d26cca0d5fff4e1dbbd7088cb88ca705fa80df33437e1d9ca16305e162757010fa5c3ae5c869c20ed8a3bcbc72f89e055b5b8af1bb9110411e04e920e19d5 SHA512 e57405fe56630baef2d062973576b33b1528640491164f1cfd64bf230a9f2afb0c75e2ac6bfab2f085b4b7aee8c138315a9cfe56abc52e7c1a5385e80eb66ef1
@@ -68,6 +70,10 @@ DIST gentoo-kernel-6.6.31-1.amd64.gpkg.tar 147333120 BLAKE2B 52abf0ed45cdcf3bcb2
 DIST gentoo-kernel-6.6.31-1.arm64.gpkg.tar 119326720 BLAKE2B cb9d21a8084a1671a61668ae62c0dd7e38a1d0f0589b79196ad7c81033e789541336be6ed5a1e0e4a885475f9aeed1bcf40be4e95eab581094a96b90b318df4d SHA512 9163959e18b9c1f8607082b00673baa07a3b6786549091d42e52f81a5c7208e55b4e427adbd22297eee4471443df78cc9d7f433bb7032632d5fec817b5aea412
 DIST gentoo-kernel-6.6.31-1.ppc64le.gpkg.tar 64389120 BLAKE2B 1b6cd46804c1f67e6b3532f79ed738eab68cad833a08c728df765eb1986348a45f80eed496535e2fb1eb508c8b4f2cf03399e57437466af453f05890f40c3242 SHA512 981401200780db5f1bab92b96e05e5120641867d7bd83d91ed9979f08b5158a67fa3570ffc8048760911a85fbb2e7b186277203a8ba801ab9e02acf94fa61e09
 DIST gentoo-kernel-6.6.31-1.x86.gpkg.tar 68362240 BLAKE2B 3a83d8ff3ccc520a1bfbeef07ea0faf2870bc8b0efc0eacc47cb817e4f157e6a78ccf47d2fe95adacc5f38e5af8da7e851171de3851fb8de0b7135933908bcf5 SHA512 ba80ffcbfb0a84fe1a70e7838921ebcfc7a1d5680247cd14968a0236a8de5ab8c4ae0dd156b4aca1003e47c47d6b8bbef251b5239bbf7571fd510ea4917f0e60
+DIST gentoo-kernel-6.6.32-1.amd64.gpkg.tar 147384320 BLAKE2B cbb095a73c7d1131486110b342904eb1fe2a712b56d361a027fd964329321451158ec0e5a29a1f6709ba3f455efe7eb858c629a8a0a4eca244f6827de7e0264b SHA512 c711d6c86a57429c91037c87945616b4b99f1ff268336638591e06dbe37b791ca61236edafb174346b6695e78247793dc2e2a714ed48fdeb076f9d450cd1ba3d
+DIST gentoo-kernel-6.6.32-1.arm64.gpkg.tar 119357440 BLAKE2B d84d3d0cee04a1f545b97b675b4c84d411fb45ee5454aa0cdc4407b396a1b5623fed095e1dae4f6519947ee9669a7f338b6c4a5f200d3c34507d41a4da93f04c SHA512 8e979b6913220cd4df4dcbf2ff84ea516a3c17fa141862352d8924a0e9b817d98a6368aceab4bdb0476203831e32705bec11314136b5761f68107513a264176a
+DIST gentoo-kernel-6.6.32-1.ppc64le.gpkg.tar 64419840 BLAKE2B f65e2d413cc9fd362b5708da6376beabc92393ffef64ba20526a71f31525d5ca3a4c8dcb6c2c1da7abe7b3327abdf32a297986763cfa972335a1c94023c88141 SHA512 a074ccea453375f11943ede64ccfe00ab2f212057c2beae20b67ec85038bf0c7b320ff0aa1aa9175c992c0ed35eeb8b26dcad1fea144730f69e1ea99c43840a6
+DIST gentoo-kernel-6.6.32-1.x86.gpkg.tar 68352000 BLAKE2B 29332a4ad8b955d1d30a0dd794e4fc5a2a40d60ecb5df77f68e4c069429b699fe82363bc4cdfa8a3d952f150d89687a70738e6d23bdda33649e8df0f5778bb71 SHA512 cb579b9d01658d35c2dc275d143001a50154bb869bd8e7141c73f9b8e1c2c3d8fb91cb1250c40d27bf69a35ae35ba188d10e2c0f774adb7767488886c8edcc04
 DIST gentoo-kernel-6.8.10-1.amd64.gpkg.tar 150886400 BLAKE2B 50f2ce73e9480045b6c06752c0325ed448d9cc7914f47d02b795c6dcb0fa9320a3884f92d967dfa2270f863498e6e1f9ba302c2025bd2f729df247911ec5ebe2 SHA512 ab2a0bd77c29addf8635698c78c8dcf473314ae4def00bc536798f39e3f4c77988b92cac07ccb20ce9678535765f8842dc4a83355b4ace80907f8e1c370300b3
 DIST gentoo-kernel-6.8.10-1.arm64.gpkg.tar 122521600 BLAKE2B 3175f3fe3fcaa08ec5813177475916db3589490e7fc1ebaa3f5f22fcc5d1ce251f934c5370ea16b17a2afd89dd7d46822e7ac0cbe739d534610d6181b2e4c5a1 SHA512 220b10b15838f179cb7f084df95d758f41e26dd2ed821152b8d1bf7cd60de39c6e587825bd40efdcf5542104b099d112a8165850bd270b32511591d7a4b52ecf
 DIST gentoo-kernel-6.8.10-1.ppc64le.gpkg.tar 66263040 BLAKE2B a896e0ef78c1055e3d6d71752858860e568a2b3b4c40f73836f0e1cc28eb38915bfdf8a04cca2b7986005b610c17a773f4aff624b9250d9dead86db064f1cd00 SHA512 0b1ef3e770775c27b647b37a4366fe33afc6df44303116c0444752265003dbe5ea5d64e1ccfd276851afe6c0b67b1491f886de76fc7d63408bebd14b21470b30

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild
new file mode 100644
index 000000000000..ecc98612a7de
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.32.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2020-2024 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##*.} + 7 ))
+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"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+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 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)"
+		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)"
+
+		# 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 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
+		# 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
+
+	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}/usr/src/linux-${KPV}"/ || 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
+}