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

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

commit:     541ec4f4373c5321fe262add8642f17badd90f26
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 14:51:12 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 15:00:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541ec4f4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.4.7.ebuild                 | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index a62f33617250..009e8ec111e7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-47.base.tar.xz 2915344 BLAKE2B 7fd49099198e9af926911b3a88312
 DIST genpatches-6.1-47.extras.tar.xz 3812 BLAKE2B ea44d25a1637abff3a87ec17e397ef324aa08d7f62865924a61f55cf85df6a1ae5b8a56ac1f33a61955bb3ce71b28d628d34a600a1834583ab94d4111e9f4810 SHA512 9f8c831530609f2379685ec3bbe545f2bdca86f139233dceb0b10d7259b8b1207188a8f95237483b13f40c6639c6f060df4cbc67e09249c24424bc0bc83fe281
 DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729 SHA512 6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0
 DIST genpatches-6.4-8.extras.tar.xz 3696 BLAKE2B e1d121a35ab69fac09e935317c18299817c65867fb7cf7a6810f560af913a254b411259a78b61c0a31518629ad33e13e53910fbd9701602c733016869106e088 SHA512 11240038d70202c53ee17763de3f60fcb5ae0dffc8cf005d324a7cd15a865313b9da2a3e74e184090b2d674ca1a1515a1db9f2efbff7a0f5361563fc7895e87a
+DIST genpatches-6.4-9.base.tar.xz 483840 BLAKE2B 8f2796524871d00030c870fcb167f36bce2a990a248533b7bf481506f03937fc69ee34cc5e2b8e3fc994c8fb40c54f23ce14c922f99b46c63e9da7e449a6cbcc SHA512 ea23db4aac99667ce2393d7f639043c6169f0f452aa882060d009ead9ffe9b763acd2a88495114b1a691dfa178f0a82fc0df8f89546e2bc292ca643f918691c0
+DIST genpatches-6.4-9.extras.tar.xz 3700 BLAKE2B f76074d4fef0f7a531b5cc699e83d758455727029be4ffd3470116d8475ab50d880501f920baa5fb0ef607ca057b3e1385d70ba8cf928a664d922949c325251b SHA512 35401caf459266c07369825bf2a03b5c9b8c54618e48cd5a8022bee1f2c5c6be4aa6ab714ea74152c0c88ed2fb774452f0de2c50a664979bc9d44b9f7d3951eb
 DIST gentoo-kernel-5.10.187-1.amd64.gpkg.tar 66324480 BLAKE2B 34e3883ba58d1c8dc18c28b1d2e25cab0384a49962ce52de94c5b18050ef52ecdac18e9e70a0d513bcc05d2de8c18ccbf4794e7f3092829b9e0c93128cba993c SHA512 f3c36c48ac3068e7be3efc25147c14febda69150738f5e01a9a7f61a18171f48fea86a3af78c664eea3cfde37345ba939e22cc51a46caa8da538c60b142b0539
 DIST gentoo-kernel-5.10.187-1.arm64.gpkg.tar 59351040 BLAKE2B 62820819de5205c9ce636231c0e944447c6ee10720434292e190684a2b0cb585051291c443cccc14dba621d1e64f0ae52623b734427c895e01f896967d646a51 SHA512 eb9f12a981415c8e30e77245647e445bdc7810922164ee3d59c9da72feded7a0ffeb465db889fceeffc77b83768b83505917c8960b1d64dced167ff8c999415a
 DIST gentoo-kernel-5.10.187-1.ppc64le.gpkg.tar 54927360 BLAKE2B d47a826ba61dd62cded236b2d81270824dac47c993e0a5f8c2cfa5a95293236a9f2f608ce0c7c2c3425f5d5b482c96c39514c9e5c27dfa7b1e45213a2dfeef34 SHA512 2a0d197f13778eb47da5622eb3d2a38b8189534df390e8efd096827afef919fd51ad51d107f32194e7a7dfd0da37d7414b395621665aa8b0337bfbc797c0175e
@@ -28,6 +30,10 @@ DIST gentoo-kernel-6.4.6-1.amd64.gpkg.tar 83998720 BLAKE2B 4b6836c10d6c8e7123ddb
 DIST gentoo-kernel-6.4.6-1.arm64.gpkg.tar 72929280 BLAKE2B 57e32808518b34e6e65b2835a87fd1c95f3d5b210d18bacfbcc107e243150fff592ea4dc2381d73f3c2c0f186ef70d742dcec056af7d6c2f1de1b7d5db2dcca5 SHA512 ec95702769561fafaf0d3852c96d8212acb0bcf958d461af45110234e2d7f6861f6d14ab254dfd5d7267ea42ca9ffa9789d7c46373197dacb6631e470e6844c3
 DIST gentoo-kernel-6.4.6-1.ppc64le.gpkg.tar 64634880 BLAKE2B 4ce869aeae197e7811b5acdc5a9e3f17a0ee5ea0b5f9bf708227505bf52ddc44c4d485d00751f958c54036f977fc5e143ddac3bd7699ce07dd293ee8d2f71c9c SHA512 35ebc43e11089279574bc84fbd10fe25a1f085313f93c94656617f24c1ccc276d641bb859140c6820c37ccd21c0a85cbf2bb3112b3cbcf90b9e21f396b60a45b
 DIST gentoo-kernel-6.4.6-1.x86.gpkg.tar 67553280 BLAKE2B d0fe9e92dbc7126d044f07dbf95b11edcdaeaaa77a856db4f60b329aa8ea55d02d2552e7d2ff2ca0d9b32e568caa67b203efdfe5214aa22609150fa39369c81c SHA512 a8780f7258ca4717da2cd979f609c85b82215d1da04fc8994a8a2d4e5b9df8877ab42a42e02d2416e0386ed4e74cb874ce7dc1352923e8d397ffac21346346aa
+DIST gentoo-kernel-6.4.7-1.amd64.gpkg.tar 84019200 BLAKE2B fbaf9569208d704b5e49e2957d8feb6f2b9aaf383b2b2607850dd78201a6cdb0fd69a836297f38ff482caaabd6bb0ef1138d1390d8611defa9d881c10c5610e8 SHA512 d5287481117f88410ef9809844d238a965a93502fdbd0ecd1594c3885bb2f175eb09e0df918f68dbea863709434f921e4af3578d2a7738fe2d7adb0928bd8901
+DIST gentoo-kernel-6.4.7-1.arm64.gpkg.tar 72939520 BLAKE2B 857f053b0f0c205ee86f8bb7226e52bcf1f713e64d654e9ab1d25378b6ebc1c50d412a0abf57895cb66aaf28d82f495eddb129a7dc2618d1c495253194e73a4c SHA512 ae096d1d1821031590f2f5d8770ea10c65a04f46ed6974436651e70bc222f58f26bfa7ab5bf7e3514a55652b2494297c6074e87f52ee466cdb27d523d2954085
+DIST gentoo-kernel-6.4.7-1.ppc64le.gpkg.tar 64645120 BLAKE2B 49bbf25b273c791cddaafaed8260bd63ac5e0608e9b058de3afa9c6e2b1a7bd10cbe1af63d788423dfddd045ce214bb0bd7c46ae0e64ce50aeefa44f87ae491c SHA512 f3a1f04cec79bb26f26c620b7d34c23423247e20b50f3b877a2572548b60ae2d9170a0b5963feafcf9d1f0a43acf0398338d4239c5b4febb32e1f2aee2e52694
+DIST gentoo-kernel-6.4.7-1.x86.gpkg.tar 67553280 BLAKE2B a61ccd6b51ec51c2e76b21164c75dd614600bcbd6943d75fee17d72b5147968bbb9826a74f90584f34fe128830d5cc2b7baaff73b850865790a4c67f088abd16 SHA512 c3193187d2e80f7f5c3c4b8fd2aa2c2578b038a060fc657fa384715a85c6b6604e32d31feaa95a6c79993ee0b308f9741821486bbe88a5086cbd1c9687c3fdc6
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.7.ebuild
new file mode 100644
index 000000000000..3cd8c6516903
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=":"
+		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
+}