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

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

2 files changed, 121 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index fa9bcee02d59..d36926637231 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.4-160.base.tar.xz 4078816 BLAKE2B 478bc44ce285e02c37b4452fae69
 DIST genpatches-5.4-160.extras.tar.xz 1784 BLAKE2B 8184089c122bb794bc18181ed165b2d03b301f336730b3579c92780b8a551d75963051a0c3c2ce8015a8e7102fda224e7a069ddc5fb5ea90d313637879602270 SHA512 f304a0b349c1a2f42297595ef732a6e31a7babfc71031b56e7e81e14b030cbbcefc25b49429381b47bb60676f63a3ca86b24de333a4ca928825fb2fb59109839
 DIST genpatches-5.4-161.base.tar.xz 4088312 BLAKE2B b9c445ae9e163ed0d918f2833db1ff0683144d8214f7bf806a4e99cefdb33ab0c5968f6c70b9f0e15c22234a6f438a97fe566a6b04bb9dfda7d177cad98b1e6c SHA512 8e077b14090bbfc0f9c9fa8b01d3159317819b2c5f4903613d3bb3dc942ec47135a9f381fe30c5046f2fc640e35bd9f1aab8879803eebb46b051ada5d958dd43
 DIST genpatches-5.4-161.extras.tar.xz 1788 BLAKE2B 940f21b0dd0a57c70a42aac772114e16bdfe3a9ca4119c3b2ca24c7023eed73f646250bbb74f308ec33ec03ff7e0b8b73737e50436f4f0ee68344abf93e0bc2c SHA512 97ff320e68c7cc2b0467e0b4be63b5d95509ff784a98de7bca44f60db9baf31ebdb9d45cb122bd75ec87e9b9daea17b4388f552b520d96ead0e4b5975945a065
+DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
+DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
 DIST gentoo-kernel-5.10.68-1.amd64.xpak 65497706 BLAKE2B 526ea1fc91fc906828366b4f7c10cb04a0e1cffe19702443790d52ba82a99710aa9ce1eeb7832a0da9970f9ec073173c846d5872ade5ae6f44fb33c20b0c46b8 SHA512 6be46f7608dbe3ad05472264957b23e8a841ecab3a978ec94de8043f864a9e9864e8086f979bf185010e65bbec23af941eb3a82828c3341da9a365410c85a030
 DIST gentoo-kernel-5.10.68-1.arm64.xpak 61234698 BLAKE2B f30cf0cd18711f3b42d9bfcb528ca56c7bafb88477414a3ed6ecd9c26b66fe76c1c1370461c3b1b83a13266240a20f55cbc35fd68d66bb8ca20503cc26f91f15 SHA512 df478abac49f43635cbe7b79faa188570cee3419d920877f05346fae7a3a16333f95c778d170b509277a0ee08c08d73589a177b69f86fdcdf800bde8481b903c
 DIST gentoo-kernel-5.10.68-1.x86.xpak 57237230 BLAKE2B be3156a79fc45bac92220f715e0e7270c060545f222d01fc24ff5bb6a239d8187077f6c4beba1d18c704c6e858f36b22db6f1ce9ebc737e574e9130410d5c813 SHA512 7ac97263d05bd70b29388d749786788124c6e636a3b1e975df8c9225ad3106d66a93898ce1e6cffefc4ec948a36830cfd3ae16dade66d3281bfebdd3a2bf6f7e
@@ -66,6 +68,8 @@ DIST gentoo-kernel-5.4.156-1.x86.xpak 53160831 BLAKE2B 0f615e5daf5ea0e86ccf1c217
 DIST gentoo-kernel-5.4.157-1.amd64.xpak 61363009 BLAKE2B 98893eddbd303aaec3f2d3e6b0e5179d39aef30207db1414a997703323b9eaca5671cafd5ae9f42016a45c10158af8483f368a293af90a27cb3052e89625eaa7 SHA512 56258c1ecf93cb1f65bf68aa36a966c67c92770fba19603b169159d1b4b36eb21644ee5a54c4b1d318ff1a8c02a91fb9ed886756659843f6466c10be418d53ab
 DIST gentoo-kernel-5.4.157-1.arm64.xpak 57637045 BLAKE2B 1c641c638ea6e6285361c6de947015e866802035fabbb3adaa645f1c5bb56432eb9f9131cfd8286b4d257a250f2c85df687f2df64469599e51a5fb6626af0d8e SHA512 756329d52db77da7586100b778217fbe1e29c671283fb87c3a55be6ded1695f3f561a179c2cf21c80324205e2ab35144e0f7225fd5d8c6fe957fb3f61025718d
 DIST gentoo-kernel-5.4.157-1.x86.xpak 53194026 BLAKE2B 33fe49f1e94a0648180149dff4a803d16f8bd135949d44e7c652276bc797bf2ef6dfcde0367261d54559468a13b18a114ca13ef72d13f434868baac7a07b2964 SHA512 51f391a51b09a8ba4368bb210fc0d84b25c88f5af61fa619390236ac6be409f8db791cb9949e1243f5e45a5056ffc4eda25ffadbe82da3a32929d49350d8dad9
+DIST gentoo-kernel-5.4.158-1.amd64.xpak 61365744 BLAKE2B 985463752628a98755f7765199cafc22a742661e2b2b4754b0f0ee4d3d1d96ee890eccf099f26be3e58a3f78fe770080c9dfb83f0fee00c4c79c23717fa021e4 SHA512 3a7a4890768af369d07566fac6e75ff482c3488a246c95911612ece436b0ffb9c26c87ba951dec49fece3d5bef90a238fa984a494dd3dfb7460ccb8f01293ef3
+DIST gentoo-kernel-5.4.158-1.x86.xpak 53194465 BLAKE2B 4419edde2a05c5c375e085026a85b314800cbe571fd0e30f0a2123adb6db1aff60f1c0ed60611ffd756c22a8b42b69382c15c4a59d9046781bf57b9cd83e764e SHA512 c8695b6a312bde4a9f2807f79547d58f678865bf7c18435f1fc98ea285b9428de6e60885b12310d92d2f0f50a694ec583ea42a69956e5d5e1496efb33d7de3d6
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.158.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 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##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+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
+	)
+	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 ~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
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.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
+
+	# 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
+}