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

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

commit:     599acb87c9a4e56ce937643d3d12168311441121
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 18:31:02 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 18:32:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599acb87

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7576ff8c3b04..c6c61043f229 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -46,6 +46,8 @@ DIST genpatches-6.6-4.base.tar.xz 391588 BLAKE2B 8691843486b8451cd16cf35b2c9053f
 DIST genpatches-6.6-4.extras.tar.xz 3704 BLAKE2B 975ae6464f9583b51a14ce7276ee16bac1ac1facdf085b1dc7e8501a100bf5a7766dbfe37065d803d8c8ded68e3b657eafdd23be166ee5240cc67baee5089850 SHA512 9056a41cc5911f4857661d854d8b048307a4837cecde5c573a05750126392b8f64ab622ae3ca22694fffe49b1001cb2799a0e3a5b6b681c0e8aa567096619d89
 DIST genpatches-6.6-5.base.tar.xz 392288 BLAKE2B e6a9bf0886ad85754ec963185fa9204967b35c30450316ebde163c3376106db0aa75f44aac0e66fddfd487371cb37a2c5ec70bbf14bd7006369a73d1360d7880 SHA512 13833e3963fbd1ebd246c9290cfdf15dd9d62869cdcde7fb03688eba9260d2a0b8729c153d5eebd886f6e5c3b555f20764c8f8aaa36826f2823f1b97f1a8dd21
 DIST genpatches-6.6-5.extras.tar.xz 3704 BLAKE2B 739d6f239b679f80f74475f10ae3a9e613558f93275b745cbc0d8f912e00d6b9a5753ad62193b20fb4401806c315782dd1ee33336434058e4fe0f5e7b90a124d SHA512 149c0eaadc4575c839517dc8e42a5fbc91b896b22e43f21c057ea91240b05936ea7c32e2f8b9bd7c4d7d2bf2dd11abcd41185869837c160e7f8953dd7b3c150d
+DIST genpatches-6.6-6.base.tar.xz 432804 BLAKE2B 805a19720d8ed2a5cb5908c728915a58f5db8b320174f9a6c90df4a2e7d2a58f00c1e30427af035944f99341adf3a33ca5375211b7b40c77bd37077e319f718d SHA512 6ea0477daddd54d029f1a99703254afb131233cdfa3e89163c7ef45941b941e5d72c9df7f509a7280398be2a075aaffcead07a0f85db666c41cbd312d5042220
+DIST genpatches-6.6-6.extras.tar.xz 3704 BLAKE2B 24d5d1c36237b6152894ffe8f23fafeee80ca397e93367228d2f2aefb9b6100eb12097277feb44fdecd747800a81f7f654abc59d84a9bf9d44478cd6e4c7b7ff SHA512 7d00ed37a34ec44b5f61eaab1777cf9d414903bfcafb57540d01645be5f7dd0950784d722f719f7bf1515e985889b11f39bc070edcdf0d67889333ec94c4c772
 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
@@ -138,6 +140,10 @@ DIST gentoo-kernel-6.6.3-r1-1.amd64.gpkg.tar 84490240 BLAKE2B 722a0464f5794affee
 DIST gentoo-kernel-6.6.3-r1-1.arm64.gpkg.tar 74321920 BLAKE2B c11927b1b59fb16034082e5996c8181cafb3335b5b0192a3cd2610077a4e0a7ab711d3093c9e43ddc030e38390d966bcc2d869e41c00d78320cecea01728124a SHA512 028ad53a581fcbabb48793621b83ea1027bd24b9b78ac47675be9c711f3f82dfa0984e7b193fddb29804bc2646010aa9fef1afcd3b82f9a482f5b26433981589
 DIST gentoo-kernel-6.6.3-r1-1.ppc64le.gpkg.tar 64317440 BLAKE2B 39ac94c6390b3cc8d2553269c003759fa4ebe036b663b7c9b2defd3bbbc95de328122e211a7ed5a6d5459c2bf81ce7ab6a3e79c8baf85c803f9387caabbd88bc SHA512 b5bfddae82db61508f00ffc6ef12e214d87e99131b4f9b9c0fe8b4bf2dd023b99f6401cff73bfa356283f3176ac9ae50b8b14d2a54c4e89b553b6c37cacd546f
 DIST gentoo-kernel-6.6.3-r1-1.x86.gpkg.tar 68218880 BLAKE2B 1593d715cf9ad6c9744d3511dca034daece9bc9bfe3f28ce8d09570ff69a0de375da3c54fd1356c5d0463141d3edc33fe16afc868ff4bf44223f866c45ba7bf4 SHA512 6f2a305326048547f0b8b3ad069d8ac1af7548ddddf6c94deee095cc1d2dc1ee406484fa62ba0a49fcc228f1b9ad2ea1e7c670bf87e3e18820d909d781c10aba
+DIST gentoo-kernel-6.6.4-1.amd64.gpkg.tar 84541440 BLAKE2B 6f3fa087cd368f381f9b60fc8ab12dfb867a757cf595bc23915209c5e8697b792d18b1ab590b33b465c6dbf391ee0bd7a0834e8030e639a778a6e706dade3c68 SHA512 7b3e7eccbd2a1dafd48d0572b9544d9c983e9bc0b0dda3eedeca1ffb5baaecbb798abee85044a22596ca10946e596b95eee3c2b1256335f7ff68247acf1e110f
+DIST gentoo-kernel-6.6.4-1.arm64.gpkg.tar 74321920 BLAKE2B 27db040101365ba428eb323a34e5852d5959ce462304099823b15ff2d1cb07696e5b3ad35bda08ee578f01d34330e974889fb9412e000010e5aedc828a966b54 SHA512 42e1fd50e4872d19a724be3921fd7e41364265118b60134d2807a75fc77efc9b089ff9441fd511c54fa6ccaf47e2ed7d30390772843bcf0a6463cd21a950fa9f
+DIST gentoo-kernel-6.6.4-1.ppc64le.gpkg.tar 64327680 BLAKE2B d8515840b786afcc015166bd4af9fda58761463ecf2b47f6c31671df0d9b95bba8efeda93e18ab741f4c9e396318639a38b5b1c6538fa561661d4415ed8178c1 SHA512 1387320d8e2bdfc7e1ea1d54e28723cbe7680465640fc5712bdb02adcf11d74c2f6ed66b9a453197f22cb7f8a09aa3a673fc3c807ce3be989e0c1d7f13a21820
+DIST gentoo-kernel-6.6.4-1.x86.gpkg.tar 68218880 BLAKE2B 5c3f8a7b8ff34d4f9a7818a80694ff1e147b8021472b9535fdfcb0ec2ad288a4595d21d14c4c7fbc0befc2d8bfc3e1849d6bd024506e0b11af5facc5c465e492 SHA512 a5eaf652a8a3a34982e7906aaceecf6fa914c4a8cca38210cb4693ccd2366db411560d4161ce7e46c28e2352db64fb0855b936832475d65f689a70cc338679c6
 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.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.4.ebuild
new file mode 100644
index 000000000000..c378c0fde329
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.4.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##*.} + 2 ))
+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
+}