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

[Michał Górny]

commit:     19aec819eec52bfe87b194b1f913a960ba9a1a10
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 11 06:03:39 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 06:04:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19aec819

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   4 +
 .../gentoo-kernel-bin-5.4.152.ebuild               | 117 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 97e2e8457d3..da93c721e73 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfc
 DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 DIST genpatches-5.4-155.base.tar.xz 4028140 BLAKE2B be936c28ef5da5deacdaafebee8781ba759b66427140bc806858fcaa3523c8076895bbc952b018e7ddaf5aa5ec45338acc50f6e235c0d54dc687124127de6288 SHA512 7dc3aa310d15abc349627d3d305a490722b9a49fc84d2969f7e98ae6940121d5e5b6b4ef0776b6aff138531cfccfbb0a9c3bef28790345d35f9a386bd741ebb2
 DIST genpatches-5.4-155.extras.tar.xz 1788 BLAKE2B d0ce88939e6e87ff1af00b161200ebe38895aa34fbace9f6197fcc541793eead351d13ea4d0fa1c0c565ccba4f7ae191ee432d909d1961df6121ee4f7a0bd516 SHA512 5fefaa51fabf22993fd8502e48a3282f172c7609d1b7418e9fe20ce8ff79c1bc1b3d4f33e1ec1d87040ee4d13c71d64bc8b48624d03b567351842d685f0fc64e
+DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95ac492836a9686d106df394360faaef16e2e1d66b646e61199daf1b69eceb4b9aa3ca310e29d1bbda024ef1542f76778bbca4 SHA512 3d1986640f3851785c0cd5c95ac0715c81c202c2e75ff08d18c873a2f7092a2bb60032389d7899c4080ff5b16c33230c6e517a758082c1795463b338636216a1
+DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
 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
@@ -71,6 +73,8 @@ DIST gentoo-kernel-5.4.150-1.x86.xpak 53154582 BLAKE2B 3230b498ed602da9cab50d62b
 DIST gentoo-kernel-5.4.151-1.amd64.xpak 61415626 BLAKE2B bbb924ccc35a3dff6cc2284f7fd414f0add828debbbdd900c7d2a4e822b1f90b90ac8064c61798290ff806a325ea22e418191e12990f6a6887d1807ad8897201 SHA512 d033aa25c9a069cfd02eacf2aa1699840fafe0fbe17835bc6d853d04966cfbc2135bcf98a3d58afeee9dd40a4da1d867eaee7bb0e78d2bee049c3f3d62951853
 DIST gentoo-kernel-5.4.151-1.arm64-r1.xpak 57973056 BLAKE2B 2b78681505963b42718c0d899a72643d8193e43d6f5a9709855ef2e7b748aed99c9980e4852dc4a860bfdaf713d226f4a1582790cb9ac9058715c2a94037327f SHA512 1ab279e632f0f17f7efeb14735c0d7e62b51a597c5e5aeb5bbaa1ea34db662d5668f865cf7024053969baf8673fbfeebf701d6989eb43fffb9356d40b7711363
 DIST gentoo-kernel-5.4.151-1.x86.xpak 53172777 BLAKE2B 59036b5c78b49fa125f67e7066ea6e32dfc3297f0de96993a5dc8517708cc844bd1696cf573016a9f6ecec01bfcda47bf057795eecbc11d8080e1a2978eb6fe3 SHA512 ba34d560c7405cd2b6478b5e78bb8bd371d95434a30e9cc78d10df301be6dd4737a4ef84ac1c824b88f921c4f9a35f889307072355d1ed69a9a049a1551b3256
+DIST gentoo-kernel-5.4.152-1.amd64.xpak 61376142 BLAKE2B f6eed297fe1a9fbf5882522f1a2b4b154f0900b1dd38e8fa7f6e6d3dd8c8d613e8218c9eae6bb9a039c6f049910732218d9529567acf346761daf0d1da3923cb SHA512 2b4559c270a7479039288092e17b1c084b01e9d44b0207c7eb289074667fc53ec6b670f370ee9e4bc0d175aa5ce1fa38ad6d0a739c3fb852499326fa5b58ac3f
+DIST gentoo-kernel-5.4.152-1.x86.xpak 53160478 BLAKE2B 64bb7c24de23fb7bffabdd56e1d79b0ebf2d1ff9e3ab6bee70e454a4a94106d5eaa956886e78d264c204b9d7214d1664418113b92b27a59c123a39f89705e9dc SHA512 7afa3a380453b64e54153e59cb552ccf1bbe85eab665646bf0f654e3b8c0edbd25bd57acf93e2deed9d1307e5dad2f7ef037bf28da0d8d9681c9ce05c9ebdcba
 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.152.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152.ebuild
new file mode 100644
index 00000000000..19484744cb5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152.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
+}