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

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

commit:     ff50bd5d01b104d122c2b4771459039358624657
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  9 11:46:42 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 12:07:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff50bd5d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0a3ee178c45f..c462e2a25f33 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,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-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.6-45.base.tar.xz 2573196 BLAKE2B a6ff1fdc5c661f28d45e8297a325d603825148489d9ba403318fd6f7bc6664a95605ce2303dee12f5d61eb1f807a334a4483e71c08c20fa04df8cc8c2106e698 SHA512 218218a5e16d19d3477140c3a0d36a773fcc3a07fdfd131505d4cec60570a9be2e72aaf4d00611bf5f818ced5b46d13ef31605954db900934d46e5cd5e6c60d7
+DIST genpatches-6.6-45.extras.tar.xz 4048 BLAKE2B dd86fb162ed81abf47e1fe88e238d67d557294b9502dedf9d3d405e52e014ba9852ea48ef7ab62a255996cc0a3506599b07c76a20b217764c31e2efa0a636872 SHA512 8cd9e82c2c33eb625c86181e47cdf9be5a3246db140174792cb38c68e44a39103bd42964560d8af659a9f44117fd40b804927a544c32780fcbb7a023cba9bfb3
 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
 DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29 SHA512 955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa
 DIST gentoo-kernel-5.10.220-1.amd64.gpkg.tar 63283200 BLAKE2B abfa4447a66dbade52e79edebe0bf1fe6d9be7a3ae6eef0510b45b19ca6f209dd46ad8426defb9935ef10485d8704634dc45d411c2760a92af8692ba16f3d34d SHA512 8ee2d79de3c54036d4302ac542438c73132f88a803c56159c96a4fce63fb6208a299ac3310aba5ca30c3fa504f71a60ce365a06c867d884e2da104ea57cf2eb5
@@ -48,6 +50,10 @@ DIST gentoo-kernel-6.6.37-1.amd64.gpkg.tar 147374080 BLAKE2B a26bc9ce7049ecf72db
 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.6.38-1.amd64.gpkg.tar 147281920 BLAKE2B 9283f9a1363a454e946fc574a21b76531d3620ed6278094462e910179eff5fb6d2a5303b70d8ab79f9c356a88c419ed179393ea80585ac0e056189c75af13f8a SHA512 723bac0278111a9f8a8c0f8fd0ae07669b5e83988dee51691c2eb48090fda48c12fb0c8cca5f33f324cea194385e41ffa81a0159e4349564788915e3e5b0deb6
+DIST gentoo-kernel-6.6.38-1.arm64.gpkg.tar 119255040 BLAKE2B 0c9a313e57b577841d4f660269541f5820a075eeda9182d8b7d89be182241d0ad930af9b6574a0f1c8b5b00bc4c873d8693430ecc37f71281512b9fdcb1ed980 SHA512 efd98ffe982e93cc9e9f86e490ee57dc5a9c184a59fdb61aa930710f7c4288a6c9c25f91541ced9f7f0736571336ccb0a18d8f402df54df324b24bf2cf58ffb4
+DIST gentoo-kernel-6.6.38-1.ppc64le.gpkg.tar 64256000 BLAKE2B 9df53aad8ae5f648e5d2f11fc5e8d221de4718c48999bb0c0488cfaa405cc212838751ecdd0f03c2a96b1e67b4130827d805c2306114b5d12ac2d6f5b2ad5b22 SHA512 d994cce69cab508d98a73fff91ca3dbc068054a21b959c3e9f7033fdbc1de41d2d917489f6b3b54068141265922158cd444ccc8da49c5b714289c8d3ed2a92f7
+DIST gentoo-kernel-6.6.38-1.x86.gpkg.tar 68259840 BLAKE2B 5101f931cff8f26a0f925f4b712d7ddcf6bf407be643687f5453352bee45d0ed201ea76463d9d8ecea3a2abea7a9862082214b46d588e0abe7404de9f3bef69b SHA512 cb2d09d1416d38fba1fa884356a1d52f5ec1f5f755aab8c21987e9649bacee2cd60c19b2802accb5c576f0fe5be75fe58cbb5093fccf95750a31132d8fb5e45d
 DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B f54c76780fdec033d8ce5b419dfb8cb1d9fd36af80791532ec7d6bf5ac4472f1fff6f52151aca93cebf3f99ba569b990a850403a99b56d427b6a48a32350b735 SHA512 ddf33e3b2d19a1beadbf6e578a70f363e2fac965dc19c2fcaf4a73b768f27611c86f1c3ec2a472fe37376fcdfece48a53846ff3ca554c97d4eb9686055c1a758
 DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B 7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7 SHA512 b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad
 DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B 782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a SHA512 923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.38.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.38.ebuild
new file mode 100644
index 000000000000..e0e46cd48882
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.38.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
+}