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

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

commit:     7a175f053eee7aacfc8605b751ed4d92f186415c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 20:34:19 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 20:36:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a175f05

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.210.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 24b9106cbdb7..cd2ac811ee67 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
 DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
+DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
+DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
 DIST gentoo-kernel-5.10.135-1.amd64.xpak 67502330 BLAKE2B d138fd2cd1ff26e3256277b8fd2b45037983b0956947d64b112e639cb555ca1c4de055abdbf96c12d00eadc6e32a607ed1bbb45d9b3374a67385d5889b433fcf SHA512 5bfdef5d83ea108f12b21cd480f1b35bed751c56c42347e3f54a4f73bc3dac14be61c2133ce581e3cac685c9a4ff40d5f26c79a0117c4b1858df35c0cbd24816
 DIST gentoo-kernel-5.10.135-1.arm64.xpak 60985844 BLAKE2B a8e22cec67675594160e7f661a3952e59a0c53338164f70b23b9acdc8a304b1414e188fd51bb96de1972422654c966a78add201f38d3f2f3de3f2745d934ea97 SHA512 c5189162285035a036e23e5075554dd5aab1e8db9df6425f3409455cae61dd5a43a97fc3a47f287699399242ec4f841bb35b5e5f441d491f7de72e7448082326
 DIST gentoo-kernel-5.10.135-1.ppc64le.xpak 55988769 BLAKE2B f77eede27c91ce30fa556abc8a2e7af42aa984d8e5b973d0e9f3fde77c05790ce891d44d76d6e8c7fdbff608e3be80871b3afdda3b30c36abb3127fe9007c28a SHA512 05a09e9630c427b23905cff1074d4007ee0aa4391752419dba4e0f3dadc6fe913b394dcb76424e303943df54fe14a7ac8fd10d9755cf77dee64f2672c87b3322
@@ -28,6 +30,10 @@ DIST gentoo-kernel-5.4.209-1.amd64.xpak 61550465 BLAKE2B 4bbb9fc28663096cabf91f9
 DIST gentoo-kernel-5.4.209-1.arm64.xpak 57941118 BLAKE2B a0696286b4b7cf9e12408351ba008ef13f1a82e15cbd0c60a2f79e49068ab1b7c8bb9f8628e52539513e7a77972e284878a12fdc82c2b6893e39d5185e5b1980 SHA512 fe7e71321b5cb48daa388c4fa003ab302818dfda5d240a88d2d77fd77cb01ce0c6077a0c1d7cbf765758483ffce20751616dafa2b402c095741cffb86436dd41
 DIST gentoo-kernel-5.4.209-1.ppc64le.xpak 55272363 BLAKE2B bd869e67557e3326a78f019b6df449e6fa2f91d5312931ec8533061e7132f96d27200ef1e6217de5cdddeb327227a8f2ef4d7ecb92a88b495b1861eacf6ef8ea SHA512 5639a97831d86aa82dc0bfddb7fb01ee56881ead03e6509d3f6984a49183982322b3054b3ab7cee30d3222f795edbb8e79041c13c30a95bae2f148432b8fab51
 DIST gentoo-kernel-5.4.209-1.x86.xpak 53372138 BLAKE2B 848146fafb6b0405be32e59a2d7325668e4df197bd2e769ec73125ee3c66b65e10c505553dc6f77aaf20160205b4fcf1d45b666edf0eb17e593456ea60614d06 SHA512 6a80303f1ddfa53364ffa389ee9d2852001143afb6b8f3ca682df49b5cb44c3ffdbde80b63333f4eca65a391259cd1a4abfd90958675446bd0d05152727e92fd
+DIST gentoo-kernel-5.4.210-1.amd64.xpak 61539075 BLAKE2B 96bb8b29f443ea35291e19a880ed5c1a2bc9858cd083e1b5c5f4b47def976f2624e3627a31443c7d8d3e594df30c3264b0246ee20601dfd01db0c8dac170af67 SHA512 a83cc67fcdddb4f5a267815ab188bb6f49b40e3b8074c524ffaf238b7211f00cb0cca81ba33de4727f01dd218de6c6ff9fee1db0ff7abe43d06a7b6656700a73
+DIST gentoo-kernel-5.4.210-1.arm64.xpak 57952623 BLAKE2B a20d8fb5341ac1cc29bc3dadf1f801aa60e1c0c3f6dc945e7d2b353fb280a8a5f6a61d8382665a4fed9623d5f4e4c8d4bb235352e73bcd4de18a826b39820327 SHA512 39a22556df9e0ecb2d63c20737feeb208457338c0dd8b2594df6bab79630749b324c91895b52b95c86ed58c6d485a30932d4bbfc47e6b08aa0624753665797b4
+DIST gentoo-kernel-5.4.210-1.ppc64le.xpak 55243633 BLAKE2B de0876fecf91a05f9267e9e1b523ed99282ab82c04fc2f8213aebbeb175492287860c273b09593745361ecb1ffeeb68a16232f9378c3a85c1e9aa885851401ea SHA512 b81e51ed7767f42a0fb721834bff72fe0a1771b33a1bd00d5ce29fdddbead480e1150d2a99df00e40e8c7b2e2724e9ecba32c34cf90a074217a8ebc9d11e52b9
+DIST gentoo-kernel-5.4.210-1.x86.xpak 53326404 BLAKE2B 76034639128d131774462f70fd2e4db8b215929b583ffff99c5c8d9d567d1178e6350476189eca092bb685531c1c7b7a183184ea33b4948e24245bfb3f2d7000 SHA512 74bb91b738cbc51002aec54e9f59e01330a761b07de928ba93476b9908db025b4d0d5c994cab47f9c8d46ce4ebc66fbfea0b7e10d3124166297a1470ed3d70fa
 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.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild
new file mode 100644
index 000000000000..b6c3ce9ca64c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.210.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-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}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+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
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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
+}