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

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

commit:     d8c2ce5727b60885917facb1511d0b1bfadfbd3d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 14:43:32 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 14:45:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c2ce57

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 569a958e69e1..f0528e19d22d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 074b24c3848ba0b2521d364d67222
 DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B 0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc SHA512 5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd
 DIST genpatches-6.6-43.base.tar.xz 2527856 BLAKE2B 961c8ebaaea9c45748d990b3df6f3a343b02a186797a7fa97fd332e25b6f9cf0a294420b223b8d502dd2e266e20942e304db65e562d9086b948cca0e51920521 SHA512 f8104db60c2ff32ce04e86f995b1c4a87eb7aa5510299c7d347eeaf23f4d64c55da0590743d45e952cb894ce4f91bd2da595badbdaa71fc546685d3a7ea9026e
 DIST genpatches-6.6-43.extras.tar.xz 4052 BLAKE2B c12fe48720ff166e507be3a4cc19ee00c541ea92fd3939b6cc80bb476d63a896efb3667ca4a7aab837d60c6c3bcf2c0137dae44a60612a8d342f8b90807f671c SHA512 9de420e251c76787bf9edb1023c80453e1df103ffc8075b870bdd1456f1e0c07f8bdfaac5d0d19cf698c7d1d048a48a0ea2326791260585bf24082c713727edf
+DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B 117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376 SHA512 e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3
+DIST genpatches-6.6-44.extras.tar.xz 4048 BLAKE2B c65f9f51bf8a0089652367ccae4c10e16dc44f060ddd073bc4ca7e3d197ae8d406a67aaac81b704133b18d10d4f844da71c26284baeec68f9d2757e9fbc71a78 SHA512 3a83c0321b9653e4aef2bd642e54a6988ee566fa44ce60f8376d1a1adc7a13cce66fcf22b4cae72234ae8d3e154a2ff6d570de11405127b7e82d6d142cf84916
 DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B cb961b8245eaa58405bf758f4432f1ad98b767d7f9ea8e45fb440bd2616e67c6e12cff6ec3af89748f19043c9b0b58b634e28e7bcdc469fcc4daf2f752b3a438 SHA512 60fb3290eabe8289fc4acb4f1df809ace44d7678188683b64ef2ec92edb8c2ac0d757280ebb63087145fd068e64619a3b0a9227fd5f3061099d287e8e8dd5720
 DIST genpatches-6.9-5.extras.tar.xz 4052 BLAKE2B e72e5a5195db42f38ed671899217d7609eb8a5d9f954ebbc36a53a88fcadd1cadecf7257b33a880661e949f2c7b176a5762ecc1e56be0195e6768d8be8ae5fc4 SHA512 3d9315afb5c45cf24f6e5287048d49f6969e49ba2c8f339d9f4da0f5a08708ffa65636c3d24efdcfd246f6d28c72535089078971e97f7aefeb75119a67cee11d
 DIST genpatches-6.9-6.base.tar.xz 319896 BLAKE2B 8b58a70db0844a8455fb413de046cf0998c19c2ace54918a3408f9d31eae6bf276d6a86f5db835cc3ac87335d908c2ba853fd2f334e80cd06e7e72847483d3de SHA512 fa3f1efa0886a6df0ce8006a4433a8bf91731069aed6040e1e4ac9002dbb879ed644f2ba1b258a92ae8550709b85a3c1d2657df000cc6dfe4f79d32c991efcb6
@@ -98,6 +100,10 @@ DIST gentoo-kernel-6.6.36-1.amd64.gpkg.tar 147281920 BLAKE2B bedf47e745bc24c4a64
 DIST gentoo-kernel-6.6.36-1.arm64.gpkg.tar 119224320 BLAKE2B b807655882db1be32729731462df1d1bf9354266146032c1ab7ae46839d995d8a6283ee0f0d848d54117ae77c329d4146123c1f0a715d84b8e8feb7eea93ae81 SHA512 aaaf88ced679e353a5eb2e42efc21b3727d078e981b5ce599e347fd440ef7704421324e504d350117fd1760901a7f22b20200be1f5a6dd44f4ce121311dfa5da
 DIST gentoo-kernel-6.6.36-1.ppc64le.gpkg.tar 64245760 BLAKE2B 6b13f18a8c23d7bbbf15459bd26d5ea2ce7307543ec11dcf6a1245bf4415b179102d1f4f8832803deb1e01efe7340a31b84535d7ec30baa780dbc278dba4dae0 SHA512 00e057b14f8c8126e7c4670a6545a64777565c85235a27d5b1aa58330ed76acd37e0bf24185cbcfb450674426353963ddf5fbda6895a50bf3cf8908e8b36552b
 DIST gentoo-kernel-6.6.36-1.x86.gpkg.tar 68239360 BLAKE2B 1e2e6cba949d03e518ec729fdd48cd1fb112e5db5825caf990b88f895acd091662ddf278eeadfb6187e050a5dbe867c36a9b280efa51ed43d7c4019c219a3c35 SHA512 f65ebe167d6a953a150a6a1b8ed42c9e78b462c5c4ca01bea00e0f67ae907ab096380866a243c98bc52fb2de93c40bd16e0ae6b5e72fcb15d77b958657e0fbc6
+DIST gentoo-kernel-6.6.37-1.amd64.gpkg.tar 147374080 BLAKE2B a26bc9ce7049ecf72dbb95067d31eb10222602bd084e2a892347ce45ae766f9ee9abc5b4a44fd08ca2611c6ea9c0d447905215f6d17e8bc839d6cde1aaba297d SHA512 d0a46dc030b0721cd014cb0354827fac87ecd3e8c88a8c3b50e6033faa2cddb904252507f173dbb167a94ddadadf1a53dcd6a252a542de7fde1ff6615d707e66
+DIST gentoo-kernel-6.6.37-1.arm64.gpkg.tar 119234560 BLAKE2B bf8868a4f9dca993a75824c998662fdd42489e193819e2e4d977802ce0a966fd0e77ca4c2378a38e4208e373887d11447d90a321e756b405e361ddf36e4c0a12 SHA512 9be0cc25ec906ea22d408d3d0e45157e7afe28195db05a14d8ad1bbc8166490382d147b383259f886cecf73e895f0241ab2b3f183a82d0af2597613b68f7c2d3
+DIST gentoo-kernel-6.6.37-1.ppc64le.gpkg.tar 64256000 BLAKE2B 3e86dab47a5ddd8a77db788fd9ab7ea2804c286ce37c6173d66ad6cd3a6dbaf2c315f47292875b930c548755da6f5cc7e17f40ffaf53e8117502717010636806 SHA512 1601f8807b1ed8a1b047d4619dfd565052f62b2041574e92843c4286ba740ca098a69b2b74fc39c49323d3945195d6d0b87d4bca85d00e9c29a160f20bc1da34
+DIST gentoo-kernel-6.6.37-1.x86.gpkg.tar 68259840 BLAKE2B 921d03cef3099288cb5edebedab899a2c8fb5d508093c353bfa74a0681476b47a6f739b3b1846bb93cc1e26b6fd56a184fff12216cabaf26a6cdec65f9be870f SHA512 f7738083832d0277af6877754b746daf3f26e9a3d827069cf3c48bc296bc698efd522a37b541753df366aa661fc281cc654b03c7cb1e38a1138901a451c14c68
 DIST gentoo-kernel-6.9.4-1.amd64.gpkg.tar 159006720 BLAKE2B 9e2189d7ea4546bf9d3a937ff0f3cd95929749931b4850a198c543b753a76e6e2305492fa4cd03ca3221c070107b6b1e76cee3eb5c066ca273d0b8b4b2f67efc SHA512 87b26e414a79051271531e6152b10ac11b6834983e9bd500056a4d95aead6efd2bcd45ec0456973cd464ee4b66349929e0db1cacbab50a7b8e30484293377166
 DIST gentoo-kernel-6.9.4-1.arm64.gpkg.tar 129740800 BLAKE2B aaffce5d2f922f53de6b4ebebd23ce2edf40731e79a325bf07502f0b61f440edf85d6551ac70f6d96f539ff3636091e7aeb478e74b7e45fc0adb5b8add5f31e9 SHA512 61ebb357a3a4d4cb80f90bdcb5e8ab02c810b1a39ca4aa95a2bb3be56e85435625c427f3ddf93313623e42ad81aac7a206c14eec60865ed7d661d1451779dfd8
 DIST gentoo-kernel-6.9.4-1.ppc64le.gpkg.tar 70737920 BLAKE2B 02097895e96decedf998bffaf2c442623e27c9a530c7f57dc6a6bbe7bc566142215d90a71055ea383e63d146d77cb4c3b0b3d017156f4f8f1cba22ad46bc2f0a SHA512 9057f864de4f15e7b1911f91e21cc71c888e95c26035ea3246e0f116d5a7817266ecea2e08cf1f9eb09bf41481be570034638ee1775f09e39901c599bd6b4d90

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