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

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

commit:     18889bba996a949250a8cebb35ff99e50e8d6975
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 19:02:16 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 19:10:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18889bba

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 228283321343..f394f045555c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.6-30.base.tar.xz 1698592 BLAKE2B 3e7343cfb06a081796dcc67e15c1b
 DIST genpatches-6.6-30.extras.tar.xz 3704 BLAKE2B 18c323ae1c680bc076d2b62ca5715057b2fe32db70ee582bf81c50dfe6c356acf3a5518de57d64aa046562908981c0b67cc96ee14d452093b25bbd619e206112 SHA512 01eb396bb8a6854b9c25339bc41d388743b8ebab46b2ead24e3ea87bc1de48d87e94f80df2b530569088fd431d7f700882321823dfa349a451211b689d1a71a5
 DIST genpatches-6.6-31.base.tar.xz 1700036 BLAKE2B 52497ce73dc1a0eaac0a73b7c9a8bcd02925afae9d3064e4709e17dd89184100177c6c1b8b6819448a89246cde6a6f29b82a51d906a362df0dd40b182992f872 SHA512 e4933aa19770d54e5524efc03e02be8a0c9b1eea62a53458584603e5add1d8123d279ba41cc8c33d65152a0a0649ae53ce0fd8a88b5582b39865f83b84a031e0
 DIST genpatches-6.6-31.extras.tar.xz 3704 BLAKE2B 25bfb920528a71136639dcd536f1b8182ce687d5e8059c29539ed6ea348928cab361867afeb0eef55b040fa3860c44d7510ae9d453a805785567515a7157d009 SHA512 f7e7e6b2407752f2f868afef958e88dcdfd1788bb518f17eb60baaec43e55cc69b9185ae55c515b9bc617dc1aa7d1a958b8980ffafd95228aa3322ca104a8fa3
+DIST genpatches-6.6-32.base.tar.xz 1799112 BLAKE2B a9c9af39b7da19c0d3f3a1893de26641b1d5d7ad242de4ceb1659d33573e8df8d173d363f005843149ee21598a2d4f8a6e5fbbdd02926c23cccc01a5c0b8abcc SHA512 2204a3ff6187c349a41f101bddffd39145aa530e6a37792b391db0b3c4150e290ce8909430e87c8deb18400d753a621b90c26d581c08abf104a8bc48197a1fe6
+DIST genpatches-6.6-32.extras.tar.xz 3704 BLAKE2B 42d3c81bbd7bb8f062a5f437f8c1c9db1809cea8c0628f8604f7c2c8968fca4c6629bd3dafa2eae1e7b7692ff33a9836e1be96a0e3b45db95752b96b9f76f58b SHA512 35fe52d2ad4b4621d7bb615e0c5888eae83a88d8554abae069d68e801598c2fad360c9cdefdbf3e7c3c083e50eb2317f775f2ce23c26ee7a07446184b7dbbdca
 DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6 SHA512 eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622
 DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B 2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477 SHA512 e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
 DIST genpatches-6.7-15.base.tar.xz 971400 BLAKE2B fc87e6e218c0c26051b83545f82a491a83df9b0e324f1f659329b144a81aa21ac6e90532ab080eafc99b7f87b9d8ac6aca84b043653cd09b8c41b7e34e52a9b7 SHA512 3c62c11bd8de96e86dd7224bab00103fabf5dab58c2d5d6ab2c27302802eb3d5fcd9370ab8c209f4a62a8f2d290107edbba72bf9dd8d78760c15234989aec5d8
@@ -112,6 +114,10 @@ DIST gentoo-kernel-6.6.25-1.amd64.gpkg.tar 147251200 BLAKE2B 2c56b8b0212ee8f7e87
 DIST gentoo-kernel-6.6.25-1.arm64.gpkg.tar 119255040 BLAKE2B 857bf0f41db641a568b9fc71b5a5b787e1c95d81bd1de27f2f3c843bf585a883630b0d30a8b0bafd238c4d392f09f628846a13965420581017e6a218a6615023 SHA512 106be6bdd775325e8c55b06080cde21bd7e6c8e4ffaff06478608dd2b03fa98d42127d22b8bb592aae95a8c659a96eeeb3b14b2cc3f0bd9963abec18548de948
 DIST gentoo-kernel-6.6.25-1.ppc64le.gpkg.tar 64389120 BLAKE2B e24b290784fcd9b12fd4cee895b4ee2d965e6d03f39fbddab78fdd791dd020793b56bf70a61584e002303b67b882dae64e9c7f200387dd71b89ca7dca6e9bf0e SHA512 aa64472a7ea966757b1297e314c498a66fb78ccf874baef5acdbd849e78195d30712626b2c740cbfc67ec5b30a87b679eefeada2b7a02118d9e3db93ee524cca
 DIST gentoo-kernel-6.6.25-1.x86.gpkg.tar 68341760 BLAKE2B 64786853f8cdc0b813600850ccea331ddaef49469d47e5386dc0656713e012c84e9e7acf6e07570ace91ebeb994270c0802c1f73f60bfdc8024ab53966db083a SHA512 b85885f57657f708e7651693812518434044eb20a6455adde9e1214fd75acf492fb232345dfb98b8fdc79e219bce2d932a82fecefc364931d92533923a37adca
+DIST gentoo-kernel-6.6.26-1.amd64.gpkg.tar 147240960 BLAKE2B a104a0279c3e7e07a843a2469d451a875cf0d5563f6f23dd7cdccc81a878fd54c9f9ed058d0223cde70341fc7f306339c002d583e16d097fe3ea3cac069c866c SHA512 5a51126e6ba55f3772dd6ffe889823789be1045007389d8d5f16befd3e794d776bc8d2f94ef5e308b965d270e038c9ff02434859e9797ce15ac4bacba1e21c89
+DIST gentoo-kernel-6.6.26-1.arm64.gpkg.tar 119255040 BLAKE2B 47f5b3e6229e80c8823facba3aec00b7dc27633d64908231e2b4ea2a6ab86235d401c20b97d5db10ac72344dac63d57524bb835a2945a9e6456c10c540a97f2a SHA512 48b7117b2fc028ddf146d5a59093740ab7629fa8670eda87b620024eede22836370e1154f71fb4ed3d6537fb133860253f234329f924e81ce1a2661bff24db18
+DIST gentoo-kernel-6.6.26-1.ppc64le.gpkg.tar 64389120 BLAKE2B 65f185da15cd692031b944d9429d9f0d87f6805298ac36bdeaf1a8554167cbe6131d58cb3f14d804e3730d6da91cdccaaf57a56ddc9f3ec1801c13d58254b25d SHA512 8ce68597b1e4390ad95088b9f0058c584d98e84f4d78701f8ab688638689df28f4de49b473d6adc69649b6a1d6c9c41edff88eafc2ee9219353b2962097acddd
+DIST gentoo-kernel-6.6.26-1.x86.gpkg.tar 68352000 BLAKE2B 9dbaffca008d5d7d2bb4eebd90c44da4c940b59c2785b102b6b07dbbe963b3e82d3830cd082c2bd88ff669b2a82c4a451ddb0a0d17cff73051a87e79862e5bb5 SHA512 95f7c07a279e58f562da1e7534b0cd8e541eab28cf51fd246da5d6c88479dac67809ae8390bb0ce75f063de389f469897c5c5ffd9e1e4223212a2ea5434a18da
 DIST gentoo-kernel-6.7.10-1.amd64.gpkg.tar 149401600 BLAKE2B 943b7f5a49ccf2b15dc97f7287aafb6fe9f0100e17de98610630049ba0ce0d1251153bb19cdb1227f21d502c5a7fe3652b88eaa4db6339707517d219ebc687a3 SHA512 a5e17b08097706ce0d43e3182c75529d8a7007e13c501b7409c9079f1e560010604108f8ed07f47374585a9c3b1c455c4e9ffa96eb0d1cbcbed6704b694a1d2b
 DIST gentoo-kernel-6.7.10-1.arm64.gpkg.tar 121231360 BLAKE2B 6b1d5f9cb7850d8dc9e8df63d2bedf4593e56d6658e4992c57fa77352547f2db8a27ad489df30ead11275e4681c7b19a8655d55a2304f4b62e3957edd1795673 SHA512 65ca057f02a791cc9b5929640525decd5a378d8ab5f5f34c048adc59be32c59e425398ae7d69a2efb36a1cb15deb43f87db4f4a3086007bf8d19f56914607278
 DIST gentoo-kernel-6.7.10-1.ppc64le.gpkg.tar 65536000 BLAKE2B 72b1f773ea421332d95a119a96146f0ac18268a852de43e6ffc8bd018c432689243a8f04fbe8588b670e566c574bb396bdc975ca25a45ab58e6eec63e8c2ea7a SHA512 25312e14fd2a8c31a71f6697bce9443cd46bb45e7b3bacb601971b0f6ff53c4e1c40aaba259f8c6099ed44b944f3509607cc48637ef430f373ba06ea0d7a5b3b

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