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

["Sam James" <sam@gentoo.org>]

commit:     41aabb9ff43a858adf6c663c31a0bdc32a2e5dff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 04:07:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 04:07:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41aabb9f

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

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.3.ebuild                 | 132 +++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6de6301d453b..5b7cac40e813 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.6-2.base.tar.xz 14616 BLAKE2B 3da38df6de90845f4ffdd61708573589
 DIST genpatches-6.6-2.extras.tar.xz 3704 BLAKE2B d236133d98bb12a2310894614452c4d293b082a8f42a26c502e26022432515e71791dbdba1ca25e62e5d4904b441bc86ab123915ace1606d1e28571e83f0e9a5 SHA512 3bc907ecd0bab38c21ba8703fd0b44a0f23c9ac3de36029764813d121f0e4f3da8299671ebc021bf501c7e6cd63b848bb80a14fcb601f02cf850a8bf3bb0d826
 DIST genpatches-6.6-3.base.tar.xz 214140 BLAKE2B 8004fed867cbb854c681834b0d297336189a638cf4b2f513e3f78fba469e0f385ac02ad7cfd752ec351da1aea7698576a7ae7001fd2872cd8124d4e664cba0c3 SHA512 1d6f276b145b7ebb6dbf9064319ae64050ff613f495fefaa973c06abfebce23f176ca00988918812ce81610044ab840cbf77f3b015c43754cf2c1b905a516dcd
 DIST genpatches-6.6-3.extras.tar.xz 3704 BLAKE2B b8d26172a7fe7a85bdb30d9812da3e76d9bc061597da43b66d514b6aa24fd1ca8047989196003488db13107002a727445fe6d5cc7160d795b9a6f0f2c43c0f8e SHA512 964a49545c37d981049f2471ca9a29609e491550018b248ed7cc2775e32974ccd015f116533d0468652c9ee3af0f16831cc5ba2ba4c68bffa4e250826b9b11fa
+DIST genpatches-6.6-4.base.tar.xz 391588 BLAKE2B 8691843486b8451cd16cf35b2c9053f623276ddf9375d0a41daedb1305a8d463f5e5578e99678c193c0644745029a6e7fbaef7f9e830599dfa6b28fb59d3ac3c SHA512 cc1ba9cea75c42503c4d5dc48c41a4ae11dd05396b15e4ae8efee649c6c59a779fb5efb39e5a5b1e7b9dfaecd9b75ffe130c7650ed473adc2a7bef7bdd71400b
+DIST genpatches-6.6-4.extras.tar.xz 3704 BLAKE2B 975ae6464f9583b51a14ce7276ee16bac1ac1facdf085b1dc7e8501a100bf5a7766dbfe37065d803d8c8ded68e3b657eafdd23be166ee5240cc67baee5089850 SHA512 9056a41cc5911f4857661d854d8b048307a4837cecde5c573a05750126392b8f64ab622ae3ca22694fffe49b1001cb2799a0e3a5b6b681c0e8aa567096619d89
 DIST gentoo-kernel-5.10.199-1.amd64.gpkg.tar 63242240 BLAKE2B c5d8490f744fc742385cd4098fc1396949ba1bc32b0d29e3c8541ab9a249a61e99aafe929a0415e053551237add468e38d92efc367e13b53f057e8abb2d99698 SHA512 2e9da7be543bd2cd2b487188d9b4fa871b34af728cb4a0807b410754e06e2fef7ae2008cb7aea4f1ef35092afcde398cb5e89f11b558396eb045323a5942cdb6
 DIST gentoo-kernel-5.10.199-1.arm64.gpkg.tar 56698880 BLAKE2B ce478df6097693f5129dd1f1b22850b658f6068bbf5a7600cfc7b4173e13af80150a2a6a487e6ff208ce8ce7ae5c0cefa146bb3ffae1109d67e8e761da3529cc SHA512 7d3aba171af38a1cec807874553520515bfaf77748af8371515baa8b93515444856fcd0545601a3ed8e588d68eae042be7ada0514db43bf85f5eb70a5ace6492
 DIST gentoo-kernel-5.10.199-1.ppc64le.gpkg.tar 52869120 BLAKE2B cc8101f31f64b2efc10f2fcc71025016c3a4030426c31ff3494d80488b12cfb3c6f6b61ee7a62b0392ce3592474c9927aab9fe6aa1946ecc997e5a4e170e5351 SHA512 dfff3c502f67521f37abbabad030cad9bcf12044187bc9735735fb5c5d21b7594146d7bec25bbb58557dad0e27c51676bd4efc3a7193c73ca831090c8d932269
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.6.2-1.amd64.gpkg.tar 84520960 BLAKE2B 62ab5cfa0936aa8478f3b
 DIST gentoo-kernel-6.6.2-1.arm64.gpkg.tar 74301440 BLAKE2B fa9139aa822dedf9d913921f29c7987137bfbaef414cf312c298156f32aaeb5cc9a40c7416cbc3b6568e1a951c027d77a33a0efc6bfcb192d3f1eabb5e5e8e95 SHA512 83867a2ef29cbeb1356b916a7286d7ded36bd82ffbddb4efe8d670e6eb802f93856cb8731bad607738f00a220b6e557bf11827f67cb4b62da894f70a3f1319e6
 DIST gentoo-kernel-6.6.2-1.ppc64le.gpkg.tar 64317440 BLAKE2B f87983dce68bb2dbc693eb7c8942edfd5a31a3c983ef51078bb794b675560f02fd79ac07748a725964104e42ee2bfde1bafa80d37e79e9dd312bc90f7609f563 SHA512 22154a542c4b98fc6bbf09016da17deba5dc7d5e5913afbab31dd4f8f5a1d593f61e1b481deaae64f85fe79bcdcb2bf849ca6c6b7e8cf0f57d7cd1cc193a5b61
 DIST gentoo-kernel-6.6.2-1.x86.gpkg.tar 68188160 BLAKE2B ebd34dfe2f158ddf51381a633f9a0c793bab202fffb13dcf576823b16d09ea3d2038bb5ce44d70cd702ed390c239cadec54ac5cebedcafe97f32493e2fbaa0c0 SHA512 0c04510c3f6ba41bb9b803b638ef37afc12bb0ad09b14efa31d6c4e2996b6ae32b385721c7c2a4de4a5916ddc584cbda1554efa46a6f2cb2d8a2eb902cd16232
+DIST gentoo-kernel-6.6.3-1.amd64.gpkg.tar 84510720 BLAKE2B 154e30964c265fffc67edd9bdadde503aafcb3d608cd74e261d2728802ee6aeb444f88d42353e3d66497498dcdcbfddb8292006f6733302bfdfcc7877121bf55 SHA512 020e0170babc73929b3417718356b43aebc885527a69c7d6eb46b17dd079046863e2a21775f0672531d7a00ffde72a9ffb417c3d541b8f3287b4068e33310174
+DIST gentoo-kernel-6.6.3-1.arm64.gpkg.tar 74311680 BLAKE2B 543744d1fdf1be3430ed5dbfe51061da82fa0b1b44c0944680c9b2f6205d3bf9beb1e06483981e0ae37fcd9ac4f8136350f5fb8f3def0b9bfd9592b604cb1370 SHA512 6147021a85b5f1ec94406b95f1e84978099135ab33a5e356a4e1400721243e93124cad41103c4b2697f26eb03d81c35a984d7c277c8ee6fc244941a3540fc5f4
+DIST gentoo-kernel-6.6.3-1.ppc64le.gpkg.tar 64327680 BLAKE2B 555557b71d2534643ba7585fe58de4d00745545ae032f76f4ab29f572c9c69027b0a327616908e895ebf76318119861c008d18390c32b7498504b42ae257d673 SHA512 28d558096cdac9fd76d11fb047e55c01d2aa08d9a1706d2b6e8aeba93b186e15de7f5d552692b1331398a57f355e81e3669f00d833f5b72d27d0aa092b7e818f
+DIST gentoo-kernel-6.6.3-1.x86.gpkg.tar 68188160 BLAKE2B 122b41878f499646d6848e01d74fdf96a92b2d83888ea73270365b30708d6f85d957cc416009ed18f2449c1682c60e2b811522eedce33cd2d8a3e323ff6eb62b SHA512 5e0394531a89adda874019ce88410337da8acc6617a9b634fe984a84d935766636e8c129ccd3b24b7f3200497991fa620a7de28c8c6b67ee16ce27b241339aad
 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.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.3.ebuild
new file mode 100644
index 000000000000..26b296bcb3b6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_SECUREBOOT=1
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+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}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	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
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	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
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+}