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

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

commit:     f6366b13d28ba591a8086bee70b8b7e0e6d82c28
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 19:52:13 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  2 19:53:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6366b13

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e56c18d576e8..af4934243d06 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.6-35.base.tar.xz 1860992 BLAKE2B afeb95582f83a941d830e8a90d1b7
 DIST genpatches-6.6-35.extras.tar.xz 3704 BLAKE2B 23fe1a854b29b205e93ac82a796ed6eabbc96774648168f616c2366f647dedd5f5ebade68059bc7e9f8aad5b57c8b7577b6e098859484f35c07913cb4e3567a2 SHA512 37e311b153e411df00489bf4973e1a414b480c4f2d6ac488ddd8af3f717461b14c53143696628df3750168869cfcc3cfc209599454f9873e28ae1e1390198076
 DIST genpatches-6.6-36.base.tar.xz 1937600 BLAKE2B 8e3483fb9e7b3f6f63e97eb4dc66e7f0ea8c48fc22c17981d930d89fdb878fe0325fa7898df1baa8e8252a2ca122ab77e027e0e1da0881c9240a70d5dd912951 SHA512 8b66b6584b7d14ef3a897e4d71395340d6b350ed53a656988f40487da3819d403fdacc209df593459042d6c5f3ec4605f3e0d7cd78654cbcee9928ea022a6be6
 DIST genpatches-6.6-36.extras.tar.xz 3704 BLAKE2B f264b10b2956dee9762df626cc764f53f8935b774fa84c08e553b52cc23bc91e48580b46cb5ba29f2364ac6ef98ef8993757e750cc7e5d020061118483083bb6 SHA512 c006fad1e9cd0aaa3d8d4698e8fa44a17dfa121eab23991cf3549a49cb132543a070b4ed3ab980267225eec8700dd0c6e9b71c20489a16288d22fcefd0166a9a
+DIST genpatches-6.6-37.base.tar.xz 1986828 BLAKE2B 003cfae8adc04f3ea319ecff4344662e27df5d501bcdcb1801d6b429ac85a60834a896a9222e0b9ba7c173376fa137a2470cb04f08289abd6805a2f0b07b0b0e SHA512 e21bc0eac8103091dae7d3e5d29ceebb4e47eb3e1fe63d577b0d000444837d723568c13bfac4f5deb61132dc3adc153e8de4661a15e6880b38fb097bb143bbf1
+DIST genpatches-6.6-37.extras.tar.xz 3736 BLAKE2B e54e5dc4b2cc854dbac9fc0d03dad93cbe4aa639142090271abcc0e797ab28e3377986f46767df8d6802edaed058e1b3999067c96d05ec8bbb42f48e33f96cb6 SHA512 be6299eedccde2d9e4cd37d4df14ef6c6a404892f18c40c4acfac31dfd20f1f0c28be767fccd8a7ee0817b32490057c76fc01d895f979686ade5a0357a59515b
 DIST genpatches-6.8-10.base.tar.xz 574628 BLAKE2B 87b6006dd317b24157dc7af3e0386ff598c9b596e0fe7cdc5f8f109d56191ff6741d6c55f359bc1e43ce9fc2887a614edbc1a2871343dace4ee57d2f472ff8a4 SHA512 fdc83b414ca5d72323646d345d95071a175f0a52470fb4a4b5cc7e9a3c8fd59e8d257396a8ff0bfdff81177bc24aaa3b22ba20b27b7bcf31eb71d8b428edfe0f
 DIST genpatches-6.8-10.extras.tar.xz 3704 BLAKE2B d836e79733083c5587dcb63d1fb3c30c7b91aee70660681b5fcfbdf90d4ba6fdca09dcbdab29588d267e07ffa8b338223e9590539356fa862e8fa211827d6f9f SHA512 bb01fb545a182d3073590939b172755b1883e827b6687870f889634ac00949308fd62e0d870e6d6d18d8c517dfbeafd3252f9b61d589522cf5c9d09d534ec6a4
 DIST genpatches-6.8-11.base.tar.xz 623140 BLAKE2B ab3aa16e717dc0ad99893ac73e6de6af38e83f09722088596cb0ed55d77a33c8f490c3ce81c0757933ff28bd068430adcceb99395c0a7b92c6713b89566d92a4 SHA512 19bd09eac56870b47f14373d648f839effe0e7e913cb7f61fb3c17e4f882768020c4069b72a7a384224116f5cd6b7a93b75b960a14d24c7e71fa1a083ab4c506
@@ -68,6 +70,10 @@ DIST gentoo-kernel-6.6.29-1.amd64.gpkg.tar 147220480 BLAKE2B 12d820e99a63be0c780
 DIST gentoo-kernel-6.6.29-1.arm64.gpkg.tar 119296000 BLAKE2B 6eee63fa2b9be94abaec4466822a3a17fec744f2783a0ad913ff697cc222996f166932eec38f0aa55c945c67bf1c32d0b0202ea28957d56f44abbbe871fb37df SHA512 e8e4f860065752641a83f4f0fd7bad80782571c24d113e783753f5dd77160168548dcb509f4cd0e27ced29c76a464a227833e000b93e56d4d0ce491452373473
 DIST gentoo-kernel-6.6.29-1.ppc64le.gpkg.tar 64378880 BLAKE2B d4e7586c6429117ee606d3b30bdb4771d1dc84d81e9eb3f85e7750815b5698b29891bfa688816dd0a33e7c8d4c2e2c69085c1b072b719487ad7920b6589cc836 SHA512 05029c21b2d2431ad347f41a2753fffbd542284bac40718133d96a7f0ef9cb19cfeee0fd46193adaf2b3778d7d43f0004222d905ca15ee2b2df9b964b57ab006
 DIST gentoo-kernel-6.6.29-1.x86.gpkg.tar 68331520 BLAKE2B cec0350b4f51a38de21a05e9fd8d4884ad81161c41d7b5e5bab427cb0be9c21544fad1f5272ad02d7694f7c444f013f4ce29e818cfbc61b4f96cf7734cdf21c6 SHA512 bf446bd7b9262d0fb1f5bf1ff41e7a09145d122389929ad3dd5be035d335b572adeff876e6ab8223d0b40a16dbaef56550cf7f8879e68154e415504a96ac95d9
+DIST gentoo-kernel-6.6.30-1.amd64.gpkg.tar 147240960 BLAKE2B af0b3a2289bb6b4160bb03dfc4ecf85fcc7445f74cf966c47795ee1ea1884003cab8d57a8c9c166f0c2ebdd88c0c8c09f0d9ebf95de0d2b2f1496b1aa4f85788 SHA512 e0a6d1b773b9d7148399cf4aef99258c70ea09bd4b45b0892e8f02626a567f519cef6e12b8295d08406145fa4a38d61e6e8106f12fc5fea5eaca42dba01e5f7f
+DIST gentoo-kernel-6.6.30-1.arm64.gpkg.tar 119306240 BLAKE2B eb6a34e2a34873c64079dc0370bd750818af440eeb9fa2020c42755e4ce00774d80ab595fa2a35a5e706603ceafce03cf728750cd4d3148a4ef3ad897468fb4d SHA512 b05e624b34bb217137eaa3d984502a0408019b70c2230c380ba19264cdc586d6401802916e03863f6c36af933a095d0ebc53d3b880c6f7fb7d8bdf6bb9a60c10
+DIST gentoo-kernel-6.6.30-1.ppc64le.gpkg.tar 64389120 BLAKE2B db436724c0a978faabd8cf7ea6d4c6c1dc5c8537de25a95c6af142a3ef274612d4fedcb92a394f536c4f8431fe78e1cd946c5f2b7eead01fa9a0268f38870217 SHA512 cc01db0e74aef830c130e029eedd7072853413875cb436aaf1d34baef1f5fb1596b04fb16b9a2882c6625eefead272d1ba29de37afa43eae67ed97167ada9783
+DIST gentoo-kernel-6.6.30-1.x86.gpkg.tar 68341760 BLAKE2B 2e931cf3d3dda1958c969261302811db5fef3ccfe6ac0a24a0cd69382c4e6c01613f78e9131e048c7a908bcff9ec069f1602f4c007ef6658efcf27e383adb2c5 SHA512 ec63fc1e2042ee83a2dca56a88dfd637d106151c7e1ec6607e5ac5ae6e694ba2dff88d957464793f8d042af6b4e7ba9bda6b624497d0db6c4130dbb5393122c2
 DIST gentoo-kernel-6.8.7-1.amd64.gpkg.tar 150804480 BLAKE2B e77ab6f1ecb04ff826eab5acc0e802ee66b4418dcf36996240f21bca3d2b455b19d8665b867f6b410e814e245040ca931996b6ef5f8dbfaccf89cbeec21e063f SHA512 0c137076bd29fde13ad553da908a13e1a7bbf5f9e8c48c1616a61114ecb9039b6e175b6cd806885f87d0d2858d24115a992672b1c0c072b74772b42dba0321d5
 DIST gentoo-kernel-6.8.7-1.arm64.gpkg.tar 122388480 BLAKE2B 764da1d27dfab1318aeda21163697ca39768485c19a397ba0f5cbe4ae20905a4de258f4a15e4ead7758bdd421d1ea1d59a70fea2f2912c1a7c0d7036125bf119 SHA512 fd37ac0317f5d13c302099623368d737d5dc4fb401049b99d583d3ab3a6433c118ee95f2bf07e088b239ff878db8e6500d32c1e92011dd209a45a618595c7bf6
 DIST gentoo-kernel-6.8.7-1.ppc64le.gpkg.tar 66252800 BLAKE2B 58f910af5acaf481d2c2a1c9d1ca7e4eda0d6a2670325f9c9f4e26ae879eb5aba05b473815d6fa49d97149e482a0ec85c7d89dda28da5275ccb9592a11cc959d SHA512 6cbad4972b9f47e41116b688d6e4b56e3634b075688f8dffbc9f5f23ab9bd7f1cb5419a44b29f8afd7507a6c0ec7838ccd171387c7e117acfd1819c261f3faef

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