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

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

commit:     daca82cd30ccebb90a2d25ceddfbc4595f947490
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 21:16:41 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 21:17:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daca82cd

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 4a7b15233a73..373ef3d01e69 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.6-24.base.tar.xz 1263296 BLAKE2B 16caebdd68cdf1d07c5f0e0429ee0
 DIST genpatches-6.6-24.extras.tar.xz 3704 BLAKE2B 2908fc01a54469d0b99c12b76e11a67af3251391e5f6cb7125a63d54abb681acd11f54ea26702e964a5785fa1a2557111ab9bea13c4e9a32cf4549c246b34edb SHA512 f72cf8aadaad8cff309a6030e98e29534e86c75665895d53772d3fa783df2939d74e449e1e0adb136349f7e281cc158153380d862cbbf6a3ac4916ef4b8da6e0
 DIST genpatches-6.6-25.base.tar.xz 1351392 BLAKE2B e1f5df7796f7d50a244c37d2b5e4eecdeb1d46cf25f6dc51567c6abd729aad142266fa430350e7efdd3995c02d6f8cc6ff85429fa7a019f8f9ed1a9ca2fc9b7f SHA512 a548b1552c6e89b0d9736a2d2e282eda7686a0cf781c8d3445d7394ffdabb2c16c69dcaea0341f51780181bf30a58696ea8fa2723f25b12fa6d7cfdc1effa810
 DIST genpatches-6.6-25.extras.tar.xz 3704 BLAKE2B e7709d6dc9f02a24a5efff213e4357a25777364cce38387b5a12149915017cf229546993de40b4e2aaa6c107b1930f091e5399c14b660d07f3e73a1a6c4f287f SHA512 babba6d4e397a1594d74dac9e588fe87ebc07523ddb5a8e4b23028043534a965d29a728cf7958da90e6544a3e1d0fc29de65542610f5ad513ca7d7edb5a89c5b
+DIST genpatches-6.6-27.base.tar.xz 1392292 BLAKE2B 46e3c354f7c27182c2f97bd20c165fa8bb79317bb136afbbe1e0906cd405e7cbcab1293e724cda38491f0d1cd9e9009146f18ad9b5ecf54526e69aae43fbc9e8 SHA512 363d26f9410e2d526f07c0831d36733999ec284ee01d684ad15aa5856b007a2d2a189ca414358da87a479dcbbea7ae24add9d8019b4c41c8bf1aae7b67a3b490
+DIST genpatches-6.6-27.extras.tar.xz 3700 BLAKE2B 36a21c970dd2c8f72a4496b9f72faea3e94fba49342e00b7cdfc0ca6d4f3ab14fef161a7d02ad13b1c7db73af3c96b1c145453d0645791b46b34f599b3947582 SHA512 996a1b0a5c625043ececbeacc648f4dd71da2e239482ca515b680b146ba6041feeb0924929b1b2b6ee4f3ecc24c85926e54e28058d9401d4399282151332dfce
 DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b
 DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
 DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f
@@ -106,6 +108,10 @@ DIST gentoo-kernel-6.6.19-1.amd64.gpkg.tar 146606080 BLAKE2B 4de623ac9df88fb1784
 DIST gentoo-kernel-6.6.19-1.arm64.gpkg.tar 119244800 BLAKE2B 364e3ab7fccfcf36cfa8c309051e756c15ff68600a89172af4a5f8d30e4fee51aab04c32972a0ff7dcf2858493a3afba6518ca7e1934a2a57c497d5ec75dafbd SHA512 64aedc44ccb6724604be9f1d48e315d54bdcdfe51cae9d966a258c14198afca72a4c02402a411ffefe8bbb273111df50c5a092186f2200e0e1d13ac181311629
 DIST gentoo-kernel-6.6.19-1.ppc64le.gpkg.tar 64389120 BLAKE2B c9a77bf922abc0151677ee738b168358f1cdfa382bac2f462ed28041c9f8e84021c28011eff12484efa1ad20f5aac29612b7b41d78a0ce8cc5f4fc4754dcc5bc SHA512 794f915cb591f9108133c4948cc5b383c8553add5d74238a8ca19f10eafcd4d5eccd8f6762f92c7dd83ef114bb9f0b640db429d73c2cb60bd4732f56395d8def
 DIST gentoo-kernel-6.6.19-1.x86.gpkg.tar 68341760 BLAKE2B c49ef5a146d8be20e2105cf58a41c22e361e01683454f61fddb09f603f3013fe738d0c73297d9fcd42814527d962a248e73b726b65f87d0890b5a218a83338d8 SHA512 4e52ee90378f20dc1f327157e17372d84a67a882d026ef498bb22ab6905f2861c552650dd2dafdb7383d3e9c0c6208799de86a62fb416839c389171658f893f9
+DIST gentoo-kernel-6.6.21-1.amd64.gpkg.tar 146585600 BLAKE2B 12d66fe9f0f1cfc00af099447ee1f92e381a69b60a06e0cc8cd56ec54e5b7c6e3026dfec7f4afd4e329cc7ccfafe1694fe19208228634373333a0291f884e6dc SHA512 8dd171dc40cd6f102c7dfda63cd40f39e3071955641830c5c919de8e4b9f66dec42e0c7b90e0786340c3ab0d1c29a66ec621797e21c0ab4c19b2cf77944ba115
+DIST gentoo-kernel-6.6.21-1.arm64.gpkg.tar 119234560 BLAKE2B 516a6f7c564734b777d0ff3df63b414ff2a1cc1020fa1f5d1c52f7bde26810745a770718c5ecc12ca42c536a7c3efb430fefc5e8b7b091ecdda4edaa866c5a08 SHA512 143880a199dc92a8b1268a15346e3512933d8e8203dd1a981ecae063464a3723557324a2be7310073c3a08cd95fe79d80d28a1898b649481bb836384a8562426
+DIST gentoo-kernel-6.6.21-1.ppc64le.gpkg.tar 64399360 BLAKE2B 54573396023eba5487e8d59e18358ad46ac7ae85d5b7482d48961d6da5d54d4c5d6f3ac9e2d685f956dfd90c68cb2a6319bd93492399635a9f197b02cf2cea7e SHA512 d8e4ec6a1944f9bc9dc4c666af6029fd68be78da8717b37d56390721355ad9c4cf2e1b718e17838fb41f1202d46f6f16147c802fcb06aad3b6037e9bdb623690
+DIST gentoo-kernel-6.6.21-1.x86.gpkg.tar 68331520 BLAKE2B e0a5c3f316996a02f0bfa97a03bb2470bdc0a40b6649bf38de09ae822016fc7fcb1a2f9b0d4f5ed0f192b85d94f7acb41dbb3c83ce7d0c696261e41cae4e04a4 SHA512 db539299b91800f7a2623b197ca7d593e16eb1fc36adc9dd9744a725ef17a4cf9ad5eeeb1cc294225ffd24a424caaa728eb0cfe879a4e6ad8afe7291452c66af
 DIST gentoo-kernel-6.7.5-1.amd64.gpkg.tar 148234240 BLAKE2B 1501a044d3bed23c6b9ef4088b8c4624c3202fa0f7725bd5f7b7a9ab5a1dddd9d1e971fdece4ccc7ba4f9c27ed171bd969eab2871ffdbd7689c8e23831e78fff SHA512 c8a62137008761faf84e25fa31aa9c6617fe75d104e140f8551d5d91058a7e63e5cc334bb2bbcafb7cd9828f91f79d9c3088d11c05e97fcb53d42b6f000dab52
 DIST gentoo-kernel-6.7.5-1.arm64.gpkg.tar 120791040 BLAKE2B 0d5936029886ba799f2f628b15a9fb0e29a132037fee6e4ae61c3eb9ab13608892279009cd6c65ea671bcda2efa922d29a2b4d1b1c689584e960503d47f388e9 SHA512 cc07a66a06388bcf5e777d121fee416c2e6ef85b0bca11d3554a4d74bba00898e08f7c0948696da42f46542d0e4092a8bdcc117404f3d7ab01ccf8bf52c0b671
 DIST gentoo-kernel-6.7.5-1.ppc64le.gpkg.tar 65525760 BLAKE2B d33a320750728def46329b189c45ee15836b012616090414946dc6a1e8d676cefa33d094bdbc2c881502b95af9f1d9e0128e530962b855fa89730079272b8e96 SHA512 0320e5a2394d590cb519eb8ea97c2cd89d7eda9a35a1b9b33ee472705d44d60498a4483d20cf5048254e3adccfe77a3934e20e960d49cdc47079f6d7d5359f35

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.21.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.21.ebuild
new file mode 100644
index 000000000000..b0e3fe1f8248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.21.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##*.} + 6 ))
+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
+}