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

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

commit:     4280b6f7f37e2f69b9b9a6bab2f3c3992bc8cfae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 19:25:16 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 19:31:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4280b6f7

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8778b464218..b9e83def54c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-65.base.tar.xz 2037624 BLAKE2B e2a41a62a0d01260e75bd4eb5eb1
 DIST genpatches-5.10-65.extras.tar.xz 3480 BLAKE2B 1ec5eb88df9f9ce0f6a23c4ccfc64210e27ec62faa47da6e1e21783c552c28945b275bf3450c07bb5cf3289581bb8b1e7bd5cda7afd91ffcceb1ccc554d8cc92 SHA512 8eacdd47e24028c84481fc930dc1b702435fc6997d7556352bfd109af12ed16d9b4905097e53d06f0e26d0ed1839bf5014a428701ce5078521995de9e14ec45a
 DIST genpatches-5.10-66.base.tar.xz 2062612 BLAKE2B 6aed0d13a78b49d310840e9f3d2ce17493e827c3ee5c43617b36478d02b542ca1b73ba18b8790f06df72686da9935e9596d2a3b85eb63107b998bc9765238685 SHA512 3c834cf4887f899f230db5e5a7c1f082c383726c52dda457b7fddc77e7e6e980083def63653d036a7c9bff6cfafa08abe534ef4cd8d65cc6766ef87633187df4
 DIST genpatches-5.10-66.extras.tar.xz 3476 BLAKE2B 83c469744224ee1c4e5498d30b50610f0679996262323e9e048ed14df49790fa33e704ef61c3a58fb1dc23bd13262f87cd7459a5005079eee89701fa66fab696 SHA512 985413d00a94b3e84b7be1db8ee40b6d80d7651823bf68f0a6a50fa0c46f3cbf26839d88d561aba86378d321a4628a5df90debec0e4436c01d53df074f4bd104
+DIST genpatches-5.10-67.base.tar.xz 2086184 BLAKE2B d01856f8ab1b24b9581576c80c63b7b30adf3376b70f890e527d5652c28228b17c42c28e4517689411e67b7b7a715b4ad3e1b2e045725f11d825a0ffc67f39f0 SHA512 ff55f88e4c334f463945d8f3d9aa7dfd987602057ba28496cb31a1d17ba3ec8d1eea94cd0544af6ef5f6dc140c09427a6ed0de476e0b71f9dbba5e558e8422d3
+DIST genpatches-5.10-67.extras.tar.xz 3848 BLAKE2B 1469349ac07374c4f6e8875757e588af6d78d13fa8162573ee83a201ee5158916043d013bf1202d89911584fe861d0a7ab264b63affdfd062bb23cf3e0011869 SHA512 7887ce5a472f6a778f3eaa4032f5a9ba2dac8f06dff1937188c708396f2305a499ed129e275e85aafc6746e7bbf4526cc7aefe502bcf4953c30020cbb0e9d657
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
 DIST genpatches-5.13-13.base.tar.xz 634700 BLAKE2B 2f9a12c64ec10163426b9e9b59bd2e12e6703313bea2508d7fd33b90f07170aba96af87ea2821c23372bce3e7c8180bceb8bc2e9f3884bee568ad37d76e8ca9c SHA512 24a669d68f2bedb7007d508d843a92543eeabda37cf6f18a4024d43cf3e7df3d41e91bca76e23f5e1da5b8a2769b24de9953f9c454429a18a6dc1c164b2d3638
@@ -27,6 +29,8 @@ DIST gentoo-kernel-5.10.59-1.x86.xpak 57223109 BLAKE2B 07be7a4f1221832b360cbd47e
 DIST gentoo-kernel-5.10.60-1.amd64.xpak 65504358 BLAKE2B 233766cf8fd62c2b70cf257a8bbf5dab9a45d1d10b508827c58593c7523b04e3843a69f51dd38798f5889447eae8a861f8b3cebe5985e48b63c65dbc7183ff4e SHA512 d547eee171746da27a4d1ebfce701b18c1e8fcded3c46c5ef875da6177645ed9088bdeed4188bb2d6746311ebe839b077e1a97ed5f9f7fa14ed2e43129701780
 DIST gentoo-kernel-5.10.60-1.arm64.xpak 61199661 BLAKE2B 1d004eae20fe67cdde4612d56e648cdd22975a1b5b418c0e1b80a1f9235f1b0917f4af6f8946da793dbf9fa20a42033ab397ece19308bea10b0ce5c550b45409 SHA512 649886a2117b8318dd03ce8a85905abb79cabf888ee5441da5a56d22354cbcda5be8343ada6335310dfd6192d5f3e145220aaaa52d3efd6b943151c0a3692f5f
 DIST gentoo-kernel-5.10.60-1.x86.xpak 57229580 BLAKE2B 90b7d12883271c0ac49cfff5ece81fde229c2f9f5c27c21d19c4c97132dd091bb798d75332c72491178655d8350e30addf868df71562bbaf645af5705d49daeb SHA512 043d1a0c5cefc49188a444b2ccc85decae53a318ee759449af4b30922a46329d57e1fd45f40b5c74b74f08e0cc5edc2835ba8291be460dea9699a998b9e1a6ac
+DIST gentoo-kernel-5.10.61-1.amd64.xpak 65508440 BLAKE2B 01f5355fd55446af79a237078b51a6899031327816fd59141d4ad947f1905e90c9fb7e74fac640e57d7f89c90bf3743fe76c82deb09d6a6fb4cbabbd3dbbd486 SHA512 8ece6b9caafc87297c29b92b4c2a6225dea5fc040072263ff17c89c64205d8ce2bd0e940f41ecb46d4cc1cf335688063ebacc71db8562925f9b741c6d402fb7b
+DIST gentoo-kernel-5.10.61-1.x86.xpak 57244029 BLAKE2B aa8acb2cace6c0345f982fea374cecf7e9de1897f6dfd73fd50d41b649e62fc0ca044028e72483daf63440221c1d502e0c4f65486376dda8ce6f23f973bbcf22 SHA512 2e73afac593acb951ff1bd9048b15ace23f57e9b958fb134a484f2922d02d4e4d8a72f0f5cd8507873e324e1830cbb3b1a97ee4fbecd9a4704f96f5c54c0de2d
 DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
 DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
 DIST gentoo-kernel-5.12.19-1.x86.xpak 58076509 BLAKE2B 0e4aca91c834b23fb169bb6fabab13130de811c15f89e6341ad2a36ac230071ced6c6d7bd30be0f0f3860d09968449c1933cd33ed021213c667304070b80f9a7 SHA512 9786f106ed59661546d9f035e25c39f4c7a4a41f51afa96700867e47bab19e148e8a42c79bc3b7780967c2f82f1fef6920f220fb5fccd6f267a2c6e6a3081126

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.61.ebuild
new file mode 100644
index 00000000000..b23f3e05442
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.61.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##*.} + 6 ))
+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
+}