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

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

commit:     9f9688c04e688c860ca2780aa866dea274ac5d98
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 16:04:00 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 16:18:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9688c0

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.45.ebuild                | 170 +++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 521066ba4616..c302c9b1cb1d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B 356a9a17f69416423c37c801e715d
 DIST genpatches-6.6-50.extras.tar.xz 4060 BLAKE2B 57044e169841ec9e977b107ad32741262bf3f1455638db2d105e160f2ccc21a6dc6bcd75e09e7f0761ffe3c1879dfbaf39bbef8150cd0de407875f2bbbfd700a SHA512 5c0d55dce1f869f79ec0db577d282b078ceb17667e5b18ee1abb00a6f94ee82978039ddf9650cbccfa1b8f9b99abd48057c44b230510bebe17d890e316d6c7fa
 DIST genpatches-6.6-51.base.tar.xz 2817576 BLAKE2B 42dbf8663f53bc7196c57c7cb93029b780354e6e1580405b08a34fadd2ea38302c37bb4559df4c65916b0ec2f98c61f7eced52fc6be3de0d6dbe7468dd3d8c22 SHA512 fa25988574b06ad59403b1858d97f70fe0e6056d0b889d8a6e56f44b763146da63a952a2b7361f3bcab1aa34c9a3a97f81a35113a3e5173a2e09b704e54c386f
 DIST genpatches-6.6-51.extras.tar.xz 4060 BLAKE2B a9e7008c67de6095d6c97bd6fbe9f7359e71d0b40aeb11a0ff14a0cca4feea199a3895bd9ac086d3f011b5c35a98f46d5856b8d27ca7438b8979203ff9164155 SHA512 fa649b918f1bcb7dbe4670a30dbbb47bbf8d57da73724463bc8fb5664c527f082a02f06ac96ff6a538469fe73fe0978f97bcf69b64a1a8d488387ff5a06844f6
+DIST genpatches-6.6-52.base.tar.xz 2852888 BLAKE2B 1f393bb3b90106ebab46858e2b7c2b3c0ddcff3238ee3bac594ced79e09fdcab47596859004e2aa5ce3ec9bb2acfb33d9afb9a9350de1c549cae37589f0f4755 SHA512 ce0adae3031e902dcacedddf799667a71ae3bfd5186bc435e30f266e2ce850f51e73f0ddc3d4ab2c62a3b485a55623ec00c4a57c98524d1681a1d4b4c9c2dee6
+DIST genpatches-6.6-52.extras.tar.xz 4060 BLAKE2B ba934440bce51a7d2497cefd4f98bc48bb4e1005e038bfce6d8a13660ffb9f3e3d21fb260293b5717722811c600eede8e4a1c5f2261d42da7178005ea95ec9fb SHA512 74fb01d8e49647b1f1ce134958218ec47eaf7983c55c01724a266ab29813c5878bf98701ba4af80ed1a6349d6799e7c1ed64ebe7a47584d79b38f66f91a9ce97
 DIST gentoo-kernel-5.10.222-1.amd64.gpkg.tar 63252480 BLAKE2B 0641338128a2f1fe65e42d8cad6c448a3bd195d40df440140f90412e306d30465e4895fa56ed101123b1b8690fbcd262549757adbadfe86812d66632c3e17cdc SHA512 467bf18300ad9db1aedcc39aee5168045c41e6dcf42b01df8b7ae46359ff0db0e52b8d2f9612351a268d335e1f8101884c98d798d94bd70b7cb21e9378a61be2
 DIST gentoo-kernel-5.10.222-1.arm64.gpkg.tar 56750080 BLAKE2B d7fbda9b506ea787765386d9cdca0652e400b2f2e08a07e1facd3dad2425fc0ed0a7437cae5abf482ea23cbd4cf83420e4c4f9922cd732b69a12f6bd595897b6 SHA512 b2587672993ba411f5dfc707edcb9ada9ed8390e9c01814dc763f09a5cca5bf74f1866e7e25bd836bb45d75056d2687daf6392db934be01272d1df279d3b271a
 DIST gentoo-kernel-5.10.222-1.ppc64le.gpkg.tar 52776960 BLAKE2B ec4567df5ba15b87b192ed66463888ecacb6f61246c6716e34c94a9a86ccff8bbff5ca829dbaa49cd679528cb93dea19c1848d1920e6a246ce641107e85506f5 SHA512 40ca778ab5e673eaad8ea6120324719727b87d8569fb8515c3cb73bc8ace0e888e8d66e22c91a81b966bbb8256c94d37c323152d0f4e6a906217d5375e347d5f
@@ -76,6 +78,10 @@ DIST gentoo-kernel-6.6.44-1.amd64.gpkg.tar 147599360 BLAKE2B 3febb331bc02e09618d
 DIST gentoo-kernel-6.6.44-1.arm64.gpkg.tar 119623680 BLAKE2B b511899cb69664ddb06809b89d36ad0b9c5653764c9a7a61456d156c9e8e52ee09270a41817e731df715b0ff77394d705048a6031ce8208b91bddeb3c2c97419 SHA512 1ce9dc5aa80f0ec2358b03c8aad3fbca6d99cdc6d83d37efbf34601f66e24d7fb359c31cbe007c54fb45666550a815d9f749b02d11a788e1438d514060caa199
 DIST gentoo-kernel-6.6.44-1.ppc64le.gpkg.tar 64245760 BLAKE2B 9837544ce93c514ca767ba918ff928db6420f9a389dbbca174e1e9eba2564e8f4df2ee7d85df64eedbe1f071a7ae8d4e66073eb9284f001b8067782a63d9e261 SHA512 5d1f90df86db60d8f0a6a91954551dba7a05127c9c5091d6b5575e427d99f92a877b10b789e986d52b8fd7a774a43c30066534613732336086041d68a27df36a
 DIST gentoo-kernel-6.6.44-1.x86.gpkg.tar 68270080 BLAKE2B b66846a686bf9f73fc985c8510fa29b0d2d5c0fa10d33c8dd2a7de7894b7924afd3a44073dada2f2dca58767fe618ca626a51a7f31657fc4b093e8affa47f38f SHA512 dd3d34a0fb87a10e4da863d7b198666109ccf466110abee7edb8cc6fd9b947ed071b3278d37b11791a17f8b57e2d22758eb70210f50aa3d10cd5310aa4c77555
+DIST gentoo-kernel-6.6.45-1.amd64.gpkg.tar 147660800 BLAKE2B 9eed67f68f30753ba4d3ee9f759ba4e7c6710f439914c3acea428614b57ee40e40b6f8920e148deb133c94e1f6f9f67b11ba8d8f2c097462596303714531afe9 SHA512 5f78e1b032ea6fdf11ead58e16e3140337c2a141398ec249baf6766a7c61cced0ac6e83899da3385d94ea3eda8daec3bec27e34734cbc3a129ba805fcef3d5e4
+DIST gentoo-kernel-6.6.45-1.arm64.gpkg.tar 119644160 BLAKE2B 527a649cdd97743dcc6d559ebfaefb36dbf0138fb096660d8c5a5f9819b07e2c5a27cfbde6d794d015e46f7ff87877d6bf8e9f7b9b86e8a012fde4a94f833fd1 SHA512 0f2993278a51499d464b819fcc5e0a765157406482c9929849ccf621de2591fdf1ed07c368682f9fddf1c613ff005bff8c52332227f3972105bc195ef2c57aa5
+DIST gentoo-kernel-6.6.45-1.ppc64le.gpkg.tar 64256000 BLAKE2B c6d01aeb65e33c316618d5354f681bda22a68510038dd218bf9884af1f723e4bc00cd6baadcda508716d2b42e191e222d595507c31cb960084556c07ede44f2e SHA512 86658bafd3b03a86a764884c972a69fb3d0b688b04422d304fcf04d29087d1ac03cba010ee681b9444992094af0ed72fa7eb41269973905ee9883e9fc67d1862
+DIST gentoo-kernel-6.6.45-1.x86.gpkg.tar 68280320 BLAKE2B 52d6d18a7c625a06368a0a541dec7223a0ce0baeb888942a34a953f01e48eeb8028ab9b55fe925a05594d0bae1a5c6c9f0d339ce42eafebe27704413b0f14dca SHA512 343ff66401da1b20190b5f1da1865a052ead22f1e654eba7843674f97093b02325399b6d89a4fbd051b703b52425e2aef4333f8d7c7ac2e61d002303d14118f2
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.45.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.45.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.45.ebuild
@@ -0,0 +1,170 @@
+# 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 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 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
+
+	# 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}/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
+}