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

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

commit:     88e2553ef319086c9dc75dc57e6d2f3fb9c2ce16
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 05:29:17 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 05:29:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e2553e

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5939c7daaf41..4a8df586b09d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-5.4-210.base.tar.xz 4896412 BLAKE2B cea81eeeab39b8f83386bf5c700f
 DIST genpatches-5.4-210.extras.tar.xz 1812 BLAKE2B 23abb8d1adc1ef226844f9d53611793396102dedf0d4472d4adfda32277ccb60c1e270ed3716d7e5a3f1e4d29c9a1c8a6999cfd6a19613c4953e0bd88b4b316c SHA512 a95429ccd7b7cec7f45cc1adeedd9ea90c33f4e32997d954b8f29a599f59c21914aabc3798ba66688e62215b5843213a5c08120431ff672588c9f79718cd4d4c
 DIST genpatches-5.4-211.base.tar.xz 4898356 BLAKE2B be058cf67ca37dd3eecc242039e184242f0d76e7e3300af10a4068635a02c9a8e22e08780249c00c4cd0542f5e7e0c6f97ae8f0885d0429415e87bf4dbc55a9f SHA512 5c90b96b9acd5b8c9b8ebeff0b7371029ec7615f462dc042e5d636a68e23f274c1c9b05c89df94a49d7972cce905a81442705b4b564ba9fb674cf7107bc316f6
 DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 3edd098fdbae33053dad710c08bafba66b3fff66e2e87935e904c6c5c4ecc2749d8f3135d10ffa6afae15711cdc92c725a08178eae6091355b81e93375d1cbc3 SHA512 264c25cde7a7371726350b0eeab9cc087fb0e0194e92905e1ef2ebe1467ef7ca3a0cd654b65e3fe35f49113882ab9f4041bbbd02095c935baae93b5a37f986cf
+DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B b09dfb8e041beb3ba5813e3f93ee02ef2fe3a6bb62bc4a9124bb19b74612ddca745e7066d9d11e520b6ab60e4a123428dae8e97ad28323e0d279173654a35f41 SHA512 f13c5f6d38e8b71544ee07dfbd049b611b8228d2eadb26225f0a3cb532c8aab2b321a52c17e11a732c6bbfc71586649850bb4c43b932206d7b5ce4691a0b9e2a
+DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403 SHA512 0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
 DIST gentoo-kernel-5.10.128-1.amd64.xpak 65795239 BLAKE2B ccd03c20e469543532c3df43176ab3c1dd84919930586f3e90f2fcddd6fa6b8b19531ac9b94c7f67f55acaf052ae0b11814d93c4eeec7aedb2a13765165d6fa7 SHA512 cb38dacbbe923640bd0ac679a2430d890cf3609c066196c801b562ec55e59491c1549ddab48f00d2c1e4304310fd7d45108eeccea7bf3c2667712ca8545354d5
 DIST gentoo-kernel-5.10.128-1.arm64.xpak 60993645 BLAKE2B ab40edf44057745e141504d4043d1702fbdf51d0278dfc3803800632e80e7278c347cdd3d325608e0e948b2de3e4ac0bafa824800ce486f360163e29bc0a3d4c SHA512 da31c3a1c5095f28c4824588aad43d6ccf219b1c249ce0665566f732e8920f052fe916609bfa4dd5cdf1271c601c0ab67f299068da38ca695a4b14757a6d401f
 DIST gentoo-kernel-5.10.128-1.ppc64le.xpak 56022338 BLAKE2B ac21918bdfdbd968899393e0a323808d0dd7705a7cac07057f76737c794160ea274f78acca2abe5244228f97343f08253c365bdefde74f2e7ca7ba6086e747d5 SHA512 05f3e3a6f20d1dff3fc8c1f12634e417261a55de47df189b3b9cc28ed7ce5f1673b19726d68dd00c1af4980c46769d029d83094efd98cd8865970f00b41d69c6
@@ -94,6 +96,10 @@ DIST gentoo-kernel-5.4.206-1.amd64.xpak 61553799 BLAKE2B 50a2c4a430ed9b152619563
 DIST gentoo-kernel-5.4.206-1.arm64.xpak 57679986 BLAKE2B 9cc2a0a93506be3be41a07b9740f3b218f3608483ee621cb74fdd33d8536a5285844de2642d094b186762bfd543a2535fe75d6e6946a9f1c6220fa19f288cf07 SHA512 53b1a0aafca9da0f77add7f3927ff5c4ac0c8158b383601043ae73503c28e3ca83bbb6860c5f04f9695b4c0b14d94e75afe90297ae226530096ef21fc9b7a47f
 DIST gentoo-kernel-5.4.206-1.ppc64le.xpak 55108295 BLAKE2B 9b3c4e3f41ca4ef03010aacd0ac523bf261c6c03c76e17f2c335cc212b5dea247cfa8f699870e30fca1b41f8ca5d748d96d2e792b70aa940456618c0dd02279f SHA512 cc1e5c7be5f28100afa1360bdf16a2274bb9f5e0641fbb8ae86436d952c7dd84fe3bfacfd21f49e040e0816ff9186a17444420ed636a1650a3570b800409f1c8
 DIST gentoo-kernel-5.4.206-1.x86.xpak 53293759 BLAKE2B a4435c9745fabc7428409d9ed9c70ae5ab20ea5d7588bc256e62631ba3721334240470499ee8809489347182433aef2fc8a6987e5f9dfdd02d64bad4219b1df0 SHA512 b507d17c16a81c66e35d05212d48a9004116d7e217ceddd0f465b692d7cbb0b909c6dbb59f7b1d1d73edc3d657ddf6cde29a92c574e99c1effde8ede2f80b5f6
+DIST gentoo-kernel-5.4.207-1.amd64.xpak 61529662 BLAKE2B 6b7a3c50563eeb61bac94aac4e2397660ea9968e1bff9b2d9c70b78c28330aa491d44d82da20b24317c3d0cc58773f5972e4f64fbaef0b470d37a5af1f0b8358 SHA512 c6012e94a7358748eb08d63bd36c380f1d05a0e6d41b81dd6d90e2dbf26aaeff07e502f8ab4cd7f2facef8dc4fd18295de0fda81cccf2e831469ce7522d4e5a3
+DIST gentoo-kernel-5.4.207-1.arm64.xpak 57686064 BLAKE2B 50124d68c7aec46dd61b03070b4f4d327363ec2582446e7b664d9d30a4dcb0155401d588b9465e571bfd1db3a2079e9c1c5d97616006eea07db5f9b69cfc95c2 SHA512 581c0dbdccbcfbde68e1ea02feab1140189711e5f5062fb74173950f26d1b8e13265530b52d26b48a05ca9f06aaf0736cc7f4687570c03b0bb625a6b688f6a3c
+DIST gentoo-kernel-5.4.207-1.ppc64le.xpak 55240398 BLAKE2B 5ad22d9a5c957620b6cf41fb650dfc7a8962ecb57399de8c7182beae6f0f10d44ddafafbd7c8f4e791078203b46d5c98e12d360e19f57745a4991d4e7ecafac6 SHA512 5fc4c34a44f815f8f980513b685c594e98e053a36aa0c3e899913ef9b98edaf2236d2aa7af856044b86f7919dc447599ca919f034322dbcc2de7d64cf1d046fc
+DIST gentoo-kernel-5.4.207-1.x86.xpak 53335460 BLAKE2B 2f627cf6844a40a2f3c8f7f0e3e73e7fd1a303a9edc4657b78ebf1e24f51777050141014f5f56c3d144a2528cf27022c1a396899ae0ffbcd58c171ed67a6c359 SHA512 7bb04a8b3af9195f96e7b2d84b065e75d65e113d12a81c0560942f4421fd4a7864c1c44d4a41fdcf764ff06ea3545f195fb72008eccc0a5660a617b40a88173d
 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.207.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.207.ebuild
new file mode 100644
index 000000000000..b6c3ce9ca64c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.207.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
+}