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

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 9f49a050de61..7ac806e4e05d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -40,6 +40,8 @@ DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95
 DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
 DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff632d560a9532932ced876b90d78bc2161c48d6c917297e53604ff6ac0039ce5ec6edc70c84f6ca9933fd0d74f83c5e57bd2d42 SHA512 e7380f35a80a88d2fcc0278da156042c08b7cb1b6eadcaf2ce5769fb4b6127eaa8e1ce9e8a64f8c24286a30f566df4d52184ba3fa0993c6119d7b306c88fa8cd
 DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
+DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
+DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
 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
@@ -101,6 +103,8 @@ DIST gentoo-kernel-5.4.152-1.x86.xpak 53160478 BLAKE2B 64bb7c24de23fb7bffabdd56e
 DIST gentoo-kernel-5.4.153-1.amd64.xpak 61346905 BLAKE2B 813efd5bad07ebe374dc5611eef01ac6958764ca52de4a03f9aec5e25d28a34405cda5d2b2cffff4848e857b874c0bd0dac57e9311d3274321f2e1fa10afc58a SHA512 b563e52afd8d9e1a2e0c5cec48c61bbb1acb4f20b788a2ff6799d0015ac3d8f69f7aa2d58ead4eb9a8cd3760037e94152bc90aa268043fc4ec4c93c26c0704a7
 DIST gentoo-kernel-5.4.153-1.arm64-r1.xpak 58075899 BLAKE2B 6948e53b8e1fbc82e8742517d2a808eec4aabc6503ac1f22d0d5de77473dd3a67e4772454ef5944044153966002beaca0c26593462efa85d74fdcb894aa75d58 SHA512 a64d9dd91b12dd290bcab8b9d516bf22e8e28e319bac8a196756bc2bac01cd43cc3eed7d856bdf0e4920cb6edf0f9f977ef8db28a711165a4503ad5539b1080c
 DIST gentoo-kernel-5.4.153-1.x86.xpak 53168275 BLAKE2B 583f450220035bec5e718e2251bac5a0a7d2a178c3c28dc9eb005e2f596313b0cb48d58a6d69612b110194f9d34d30fb40486351f2b5db63ca486dd38880a851 SHA512 af873b666c6cf0096a6fc370ee59cf79b8ff2c005afb29aa9611b8f75620ce2773452bdaead00f7fca206c358f26198e2585facec9bc6bc75dfc65ce780942cd
+DIST gentoo-kernel-5.4.154-1.amd64.xpak 61399049 BLAKE2B 1cd9dfa937e87a8e1ec35a2e76f761f022a3c0ecef62c8d62e1a6f2e7972b0e7684bf543819e1c395df0b421563c876de0a29ea8a57b88ef26f7ed394cca7a0b SHA512 706c3dc11604646c29174c12a94afff95f3354b9f658d66591f263dc1a45732415bffb4aa3ed116ba999065feb94723428a5d259cda7bc5373da2ce79c2f3068
+DIST gentoo-kernel-5.4.154-1.x86.xpak 53175292 BLAKE2B e6a37169fd36a40f766c3f45f1a85033dda4113bbd7167d7946dafc9f92ecb4393609466dc8f338c9ca3fdcb18c82210e9506a677bcd8f46bb3bb1b5cae427d1 SHA512 8e88fcf1201db8df51268fd1ce13cf0b534919c12426f1754d140d950a7b87b726d44d03782f3bb32738ae638c35290bda4ba682d788e90798694ba9ba135bc0
 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.154.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154.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
+}