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

[Michał Górny]

commit:     6d995c9d4356e8a7f4bf63a8b41a62cf811ce301
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 10:32:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:39:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d995c9d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9f222c5e1214..40c5d7c39785 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.14-22.base.tar.xz 864000 BLAKE2B 0a2ef4aa3504d23bc2ad1047d76d7
 DIST genpatches-5.14-22.extras.tar.xz 3844 BLAKE2B d8934cf97acf49434a817afbe3260da98f3bf52c3bb93d09e510d5c90b592af25da702cb1d6cb2c4ca463428bb35b7aba248f13ae48c094544460650c0d7da6f SHA512 d33c4adac4ebdc6a122ec60b37b8e8e1b3f8b47bc6808707c4fba9d2c8d89ded193bfe0cb0929c23fd0fc82ea1cf3d11fa739555606e6313712265e84a7cf033
 DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 59f372c304cff219647a6bf84965e13ea13b0062be222109d3baffb2e243a93905b85fa336a1592fdb2bc48ddb29a34df9d139521a258d56c363e5021f34689c SHA512 4fc8490701f55113f51314805114d3c225525b2464addc29642d337f6cfc5797bfcb0052a7f7b4045bc8b2e48fa673f5334f1c10fdd3df0bf7bcfa4bd022e36a
 DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729 SHA512 ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
+DIST genpatches-5.15-6.base.tar.xz 300776 BLAKE2B 1a3abd9e88ee1bbadf68e0a711773706e3b338626a289ce25db0591e59aba3e71ccdf5c61ec339ac55fc5ef0673415228e4a14b1f473ddc12a280f8bac5edd8f SHA512 1bceff3515b4943093d6650c7455a6f18dd9850cd84a2cf53aa9ecea46ce47dd7b760579f968d02cf22390eb7556f9e319ca842328c0ec0050ff969e10f0cbdd
+DIST genpatches-5.15-6.extras.tar.xz 3840 BLAKE2B 0c17070891e0184c34cf4f7c28648e7ffdc56992bd68113735b1f90bf0b46330d37239d4f4a8448de315e1cf2741e3c07a769eb8aad57f1ba9ef107dd8c30241 SHA512 aa484998b7789569896470d1fedd282445aa71a945b1f4d5024acfa80b6c16eb199505eaa089f7c0afd6c26eb3fc5692a890a3c0ffa912e9fa0e2ed5808d3452
 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 genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
@@ -26,6 +28,8 @@ DIST gentoo-kernel-5.14.20-1.arm64.xpak 63105775 BLAKE2B 6a5eabe8c298a767f805888
 DIST gentoo-kernel-5.14.20-1.x86.xpak 59196770 BLAKE2B 53d9544223b5a2dff33e46d63c3b02f3f05ab4b1702780d3648d6d6c770069750ab4fc96f07b55cda993bd332a977db562456f591ba2890aea786585d6793c92 SHA512 6d7cf027e366c45cacd014252f9b79ac78cdc18b450746546ebbf8506da5361262795f2921b00485a1659a5ec7bf6498e0b6d4c9c19649cb9a17498687fc73f2
 DIST gentoo-kernel-5.15.3-1.amd64.xpak 68950522 BLAKE2B 513ed80336aa6d16af4a1341a715f43383d5e0926337eded78a35f749a028b78be98905a3af119fa7560347d559a225852ab34ca541092ee703a617c1ca1deb9 SHA512 9db9590dd30ca82a0cd914c869c46e041a5f3187ab9e318a836e40cecd6baa0dce541e6a2c428c90ebfbb8ca66243aa7a84af849bc0780e5dcc19937dd4e93ff
 DIST gentoo-kernel-5.15.3-1.x86.xpak 59771064 BLAKE2B 2ab6d9f879543e4c68dd528e5e11513512acae13d39856a8ea88c9e3bb114749d872ad22f485229cbd88b542a3e8c1789b71fe317a4547c7dbd545ada28e5d53 SHA512 17a5b0647cf1cca9c6337f48c9ffb280f339201648aa97581a562fb538f918f4b5bc26553f41cd9e566b3f2534d6533a8c101e4823f531d891c5f05f6b1cd03e
+DIST gentoo-kernel-5.15.4-1.amd64.xpak 69023599 BLAKE2B c5d5d16b43e8548e1016f4432d8dc035d1569a75af81a34eda92fa068ab65215894bd1d8081b1b5a531aeb77c1b6380e7a33b458b363e11da189b6b3789671b0 SHA512 a7bf12b8ee6932451ea691d6483a7119e81ec576316418ca53b5a2a947ebbe96b3f4513bb9c6f5e0d1f7c192e6b72aad6d2e187188effdc116b4be88b7f95bb3
+DIST gentoo-kernel-5.15.4-1.x86.xpak 59852931 BLAKE2B a1003536287b44381077246b5d383d339a6fa7fbfab7d013d08a66573d24e26fa612a9beab65332cfb0ee97a976570e2ec0ec569dcaea317d2050c93a16b0108 SHA512 62ccf6ca57f5a69f9c70fc85de571e7e341e09f3b46556c5ba1aa37376398c0afb3468a4e9f7351ffe4f52beaab3b94bb908cab5a810e06dda2fb4a5ac7ac5a9
 DIST gentoo-kernel-5.4.158-1.amd64.xpak 61365744 BLAKE2B 985463752628a98755f7765199cafc22a742661e2b2b4754b0f0ee4d3d1d96ee890eccf099f26be3e58a3f78fe770080c9dfb83f0fee00c4c79c23717fa021e4 SHA512 3a7a4890768af369d07566fac6e75ff482c3488a246c95911612ece436b0ffb9c26c87ba951dec49fece3d5bef90a238fa984a494dd3dfb7460ccb8f01293ef3
 DIST gentoo-kernel-5.4.158-1.arm64.xpak 57629591 BLAKE2B 75bfe916311d6b16bf2b8a8f7a641b359b1f94b24fd35cc728e424f1df4e66579dc614f52b1fddd2cb1c2929b40dec26993fba8933a054a4d412078eca7a8eac SHA512 6b7cf2d6796dcdb567fe2c84a968726145e492799c7f40a92e501a84df385ca7da213ffd72799bae483558e7528029a97fb68757a9685272690dc2c88d70abe0
 DIST gentoo-kernel-5.4.158-1.x86.xpak 53194465 BLAKE2B 4419edde2a05c5c375e085026a85b314800cbe571fd0e30f0a2123adb6db1aff60f1c0ed60611ffd756c22a8b42b69382c15c4a59d9046781bf57b9cd83e764e SHA512 c8695b6a312bde4a9f2807f79547d58f678865bf7c18435f1fc98ea285b9428de6e60885b12310d92d2f0f50a694ec583ea42a69956e5d5e1496efb33d7de3d6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.4.ebuild
new file mode 100644
index 000000000000..e00d3ebb8dc1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.4.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##*.} + 2 ))
+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
+}