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

[Michał Górny]

commit:     f7c5df176322fa4e3928a557c3f05fc4bd457c46
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  7 19:02:44 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul  7 19:35:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c5df17

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 35a7581502e..eebaedfdb26 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f903
 DIST genpatches-5.12-16.extras.tar.xz 3412 BLAKE2B d0e429e2c9e1a2733a216e57c32c73f55285edc74f801017261925f246e44148c58cd8745caa6afc9cafa9c090d01206acc3cb96dc0ab260a834a0b3dd0e8918 SHA512 24a1f8b2f2993c157fa0efe5649b7494084d925f8665a8c0727ad431da00fcc8bfa7e00ac1d2b308b1297c1c202eac687d7539999eed38f44e71a9cb94327ef6
 DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59ed6ccd6f29a1a139132364aa2ad7c89b0af4df6df75e800cc14b444edb9897f4474015369b9cea878fef487c8a3e2123a715 SHA512 f4b5773b9885817889895725ece76d50da95439769d96fd4058d690937027ee6baffec62941b15df04b7e12df29d1177257daba39c41418e2f2a400565aacaf9
 DIST genpatches-5.12-17.extras.tar.xz 3412 BLAKE2B abbc0dbb59a91d6733f5c56918aee4d0bedfaa9f87687979f0b2b01778e2a934396c5b797050d1d05e52c2432f6fd32891176b4cb64709273ba810a1b7166884 SHA512 d36015ad8ee2bf8efb5c0b0786a661326d7833ab1d185e9e06791474b03036022bc6d6d1a22c1d4d086922b9db43ecec97a8dd5ff9daafd591a7b3092f839e5f
+DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e901761762934f34257e7064e65e9e9a29203c80a88ce31d55bff7156d8a09070dd67c79c383b0f1516757fbec1f5c722e844bff4 SHA512 31283759d7bb2a9b674489f4074a3027d52b5276df9e574d2d040007cdf679237ced0466724ddd81cb20714c7676f12b09f7c0014c1335227dc3bcc0358da701
+DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
 DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
 DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
 DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
@@ -63,6 +65,8 @@ DIST gentoo-kernel-5.12.13-1.amd64.xpak 66367685 BLAKE2B 5003780ce8ce24b1110a8e7
 DIST gentoo-kernel-5.12.13-1.x86.xpak 58064879 BLAKE2B d249693501238524606aa8c7544888745d45582f0ec94ab23c69c4c75e92e7d7619f7f2c3a2620f68b94d7c9605cd36baf5c927353385cd717f7b1a2acd7be1d SHA512 3b947c243ec8517b32314947b140922f5fc6c80fb75bb5eb96fe84a537baccd096088b3643ec00c25e5f87610705383736b4decf37bc4edd61ddf77b457f750f
 DIST gentoo-kernel-5.12.14-1.amd64.xpak 66384986 BLAKE2B 42979ab70fc69caf68d60bce85895d1d1c93b9587f1a545ae98639f2c7800e712fa9c8acf5fb6d2e41ca2a088f9b51af881008ec98299368030a52146ac28604 SHA512 16c05df2857f7058e8becf5fa9451cdfde76a34615de0803c3586ffd1c8b22429eb3eb1d00679d40123bd96c0d43e4bf8f237dbfbcec9b3dea729ec1a6e758f8
 DIST gentoo-kernel-5.12.14-1.x86.xpak 58064174 BLAKE2B b614ad928d99685a4b93482155e1bfdaec106c868fc7e619dee0fe9c68d101ceabb16cb203555fac00332f19dda028a30b5aece8d046ed24ae3948efbb081046 SHA512 664f8db652b124b4db2ebcf331d295529f2832d033b81e21a0517da5c002bb6c96dfba77c389af87641174468f4693332c1d0ca2d295e69b7229d068613ce332
+DIST gentoo-kernel-5.12.15-1.amd64.xpak 66395917 BLAKE2B b77c5e26863dc1c10da3c82904ef035f93c7bbbf60925f7c91836b7cfbb3d32335a8cad78a9b1a90a6d462f34fb798c393f7f992c54ffe6e1a5391b1e63652a4 SHA512 3efe58c6e9d948981fe51fc93ceb73de2f9a049cd396c62e743b3c5033eaf60b05d3100b2377060d1ba6245118281a49447bb5404dd4cc12b616a682fc4c252a
+DIST gentoo-kernel-5.12.15-1.x86.xpak 58062337 BLAKE2B 2ea33f13f41f6153e117dc99fdb805ff6a24071b6231730ff159ea2597e203655e5d6daa632f4fc8ace6444d8ffec7e624d222500b32e7b33035ac5a56b3efcb SHA512 62cae2c8e1fb42b3cf2ab48ade6fcbffcc03fe3b48c0d00fa7f2d3229e43a615887907e70b3219c3b040061134134f95c11c9b2d33a1f0ae568df7ec47507395
 DIST gentoo-kernel-5.4.120-1.amd64.xpak 61385726 BLAKE2B 4eda28bcfaaeb8caaa0d74c6fb37b203528ccd9853c775bcd40dc9f4698edc282a5c70602b42945b98840b1ea3d6b0d620b7726c65c83c16363e1c7542822cc1 SHA512 c36c7c5f309dea87df6af0567929f7fe09656ac49e33fd7edca62522aa45656e53d717dca5a9702b246446f25d7c3249ef0fdae8554f71cedf90339bc8b620eb
 DIST gentoo-kernel-5.4.120-1.arm64.xpak 56380077 BLAKE2B d9d0a98d00b17925c852b75875ba4eb373624cd1fc35df60aa50796e81facb5067146f3008313b5776aae7b251ae6559118cb36f1480813073341dfa37de01ac SHA512 c207f79b59ae38ab58a2f7341c8d21e3fc388eb949417a033d4dfd9fb0a7acdcac4a1d5ce8528708e7a2dfba1b241f0cf03235b5c2fb9dd1c930a36a8bebd2f5
 DIST gentoo-kernel-5.4.120-1.x86.xpak 53191725 BLAKE2B 816d230d0755058eb5ff090977e607b5d077ff5d49766da19416593aafaa529becb742abe6ef59f0212e64affe95e45a313559b5741257c05826be539e9a849f SHA512 86ce9f57c0b14f6edf3403fe2868d7c32f7d55ffa714ffeecd4c3830eb88633aaa71455e8a962a2ace0363981b2b820b4fab50ed10893ccf7470945c6e31a196

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