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

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

commit:     8a701ca4504882aa4f9b55695fc0a40857b787e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 04:11:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:11:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a701ca4

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index cc51ccf2dc69..1b48f2622a21 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31
 DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B 1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107 SHA512 6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
 DIST genpatches-6.6-8.base.tar.xz 472816 BLAKE2B 503418967edebb8cb2020edab16f060334fc16c9f6ce7980b8e25e3db1fc4869571fd466abc8ec4add3a095d089f0c77532b2524fae1136c5f7ed487e90ccd3c SHA512 04a247aadefd43a9ec1382b5f77f18dabb1701469cbeabcaa1604405cea9112bec56bc9a08d33f9ce5ebb90b8d77a7c7a21774a10906f3c8a685c0d3c10bbe9d
 DIST genpatches-6.6-8.extras.tar.xz 3704 BLAKE2B c474c55469c536f563036c74038f7a5f083e23e049648377ff42d517faa34ed14ed6d576695990c21883b98036a93f144b636b9024108367dd131bf3366074d0 SHA512 f7a9f0f448c210981cd412a0766b26fd19e8147659d91db4e3d3d4ff4dea514c4c3a08bc6bb45de0289546c5bb428c1db4f517b45c57c3b7bfacb7a991e1826f
+DIST genpatches-6.6-9.base.tar.xz 542696 BLAKE2B c0b650debf66e74923faeb933712acf4697dee9351bb3814845e5a4505818669d9392e5fca6cca4b28d42e29ff6c80e5a8e62de0446e121f950df12a83aa0cc9 SHA512 a02ab965d0beec3f72527176ad9c6858558dacdd6151cd6f3e3ec073f9965a74a048336e9403de12dd4bea4764aaa28f364ec941d86d4582271347f0d2394c7d
+DIST genpatches-6.6-9.extras.tar.xz 3704 BLAKE2B 3917a85e31159724a2011824cf64c7d2cc169bdecfe2d0c051e0cc2fc4200cfd0bdd7f2cc17f8feb616375d54c43a0bf59431dd72f9ed6ff63bbf25974bdd654 SHA512 1d1e47db577ae990dd11709896384f1c9c49166c89e08e5838751794b9d3537cf447507b78f4cf08d9a4c6a9f94dbf384458fb3b0ae2232b1068b6082977b117
 DIST gentoo-kernel-5.10.203-1.amd64.gpkg.tar 63232000 BLAKE2B f59a1414569c6d09a0fc9955cb67bdc5c5c19bf3cc433ac8966503d2e392b5a59fe0d6e7a7d4d1df7a97670412941730366b0d99b9a5f5fba7bdc00aba38308c SHA512 3ab651cde29a7c0379214e5b987ac70cb81f2edf7004f12361b4eadb22c4c47eca1807a8b058c5feae86c2b45258e8437c250ddb2867d46ff599a20ab2b9501e
 DIST gentoo-kernel-5.10.203-1.arm64.gpkg.tar 56719360 BLAKE2B fc20a53d9280a4af29959f57f2613e25812229e26ab6a52f436064f73ee7f9131ca6aa0da293af471bc882d8cb1d075cbba2a357903546ef9c6d62aa061e4c66 SHA512 4638b0434965262e9dd1029481262f90650335f195ae38d0168e3643e4fdbbaa29b100966601bb9e7dae0ec91a8e4124dd902282c3aa89071d3561f44631b7f1
 DIST gentoo-kernel-5.10.203-1.ppc64le.gpkg.tar 52858880 BLAKE2B 311524d8799daffb3499dfb8b7814bca9598152fed3e81b74e18b7300babd93966b7894039eee91746e61d7dde3e21723be3dd8d59d9e2df07b4a4298bc9b84c SHA512 d3f840b2b412163b898d512b50ce97e908d0522c8d580198fe096846464e7cd189cc7515287b209f613d4a55bf6038320c035b1cadce643ca7d71d8b83b08607
@@ -34,6 +36,10 @@ DIST gentoo-kernel-6.6.6-1.amd64.gpkg.tar 84520960 BLAKE2B 13b6b70eb0f06491fc0e7
 DIST gentoo-kernel-6.6.6-1.arm64.gpkg.tar 74321920 BLAKE2B d08c288fd33f0d247de269a3264d27d85b5d5c4b28de070e6e073dfe1a3777240e2eef8124586340945e52c9c22e96dd75e6e9980678ee54a758cdec4b798fec SHA512 3e3344486b2d9746cf2a89981894cafc2635f9af44f9df26eae2c03a69321fc1d111550b2bd25301e4ee98c03059945a67d0f168247da6402f05cfe034816ebb
 DIST gentoo-kernel-6.6.6-1.ppc64le.gpkg.tar 64327680 BLAKE2B 014397a3723e87f720d19ce51d6535a04c163b9fe157465fec42014407d449cc0d66fef067b8c9b92fd39921e3f68a99869675b96d53e5f3b6362b1408b134be SHA512 59721a9d1c31ebe2660cf45f89c82262337f58764178c4cd612554df3e5ae9d6dbc62ab9255283123bf8d1a6875e2b0d0875c4f5ea4a92beca7e12c0ec993d78
 DIST gentoo-kernel-6.6.6-1.x86.gpkg.tar 68239360 BLAKE2B fd979634c4a7bcb4b69fef2660ba30182df3fca5c69093652cfdb2239b45e38ef98e4a38200eaf27d615decd9729bc3ac06ba639aa878f5445b29c7447cca30f SHA512 90fbec34adf67bdc36b260c64349c2aa4442abc3c2e82c0be1781903a384e372a75b39da29bd44af230682fc81a2b2ddb5d507e12eecd48efa1da5150c8d333e
+DIST gentoo-kernel-6.6.7-1.amd64.gpkg.tar 84561920 BLAKE2B a69ea27ab96a6fabd6391fb28d2815191133aa4aa42315abbe2509f76d6379e8e3019105cd93a6e847c3534a780e93de4298f2132350880745ebb4642460e3fa SHA512 c6a0b7e10fa27f89842cc55f179842fc92b77aea108fefd698153e779faf163cafe73e090892089a74d9a82e846a6948fef60d914a9aed8f91890eacd83369bd
+DIST gentoo-kernel-6.6.7-1.arm64.gpkg.tar 74321920 BLAKE2B 6828e56505da5c3b804cd3e98436bb4fdda0963e531ae193e4859041ab94d7d9e4da9cc829fa4404e0cc0c222f6bc2b58ffbd2e70b81b48a9e84771420b116b6 SHA512 e0e3c54ec862e06b765abbeea263ecbba1be3b5efa0fa479b9d5bd9bff32e6cc7adc5639aa17cd2dbd0d78894a832332c494e026af59f3757a87eee8d196c375
+DIST gentoo-kernel-6.6.7-1.ppc64le.gpkg.tar 64317440 BLAKE2B 7e59a93f9bc44c98df9a3e1e107004c929420333f0c0e6166c8430563233aded7d32ee63c7f1046282d2786792440caf4558dd6684a6035a4fd7c17612d4dca0 SHA512 ff8745e2d696844b96c129dc06bdd537c853c17615adc0d30241b4e7e923bf805e70eb11191f27ad18393d3ea9fb9135f588e57d16b0f77242e34cd73b3d8d70
+DIST gentoo-kernel-6.6.7-1.x86.gpkg.tar 68270080 BLAKE2B 07ff96c2e2bd7dd3b19ccd871661120c6ac480741518907204da1a4d47dfe3f4a3536d867f5baf13c9cdd470e20777bd995a7f53ea0b91e9ad82ca31fc4550c9 SHA512 ebb289457a051e874249371c032c42be42ca939afe2a54c098f47c349f3106c5cedf0e389c62d2aadc881606584eca2cc9fecd43c396f5957bbc174dd044693f
 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.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.7.ebuild
new file mode 100644
index 000000000000..c378c0fde329
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.7.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
+}