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

["Sam James" <sam@gentoo.org>]

commit:     b2bcba5d6cb7a1ccffe2ae1dbb724a9cd00dedae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  4 00:54:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 00:54:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bcba5d

sys-kernel/gentoo-kernel-bin: bump to 5.12.13 for arm64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   3 +
 .../gentoo-kernel-bin-5.12.13-r1.ebuild            | 115 +++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 6624c07e1af..1f8d587e0cb 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1
 DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
 DIST genpatches-5.12-13.base.tar.xz 661044 BLAKE2B f9b14633dd2895fab6d47ccf99d425b4d4c260c58bd2511c8166fc440c1cff337711b805b2ef76f787c6232115df96ec9706a3c1e65e6bc2c8a8b6dd1436dc0f SHA512 8039f529138bcc3b8a485b25a16b1f436b7756d91c018a70a6f6951dc7ce329a1f8441bad90ede66329283ee6ee314c22411e283bb76f46d0ad9e03b0a8e2b24
 DIST genpatches-5.12-13.extras.tar.xz 3412 BLAKE2B abef35f4ac38e4b0ab7863376e72534c27d32f3b974f4368be54c0d9ace766749ca4334f7622b2963e1dd51a05f1262d58f7de03ed8d0a73c3f2b68a2b48ab76 SHA512 72bb3380b6382938d9b3957e4f47267616b8dd50d7a4991750b131c844c882b1d67801fd917c89444bde9d875cdfdf9d8e25bda079d5d97f42af7c2655343f61
+DIST genpatches-5.12-14.base.tar.xz 660992 BLAKE2B 31b0a7625c6a7f0ab32a3f201f2d655b7d4f85da68c7e851d93a3187c62d781ce0971dd2943447d77757ee43186f963c4d010e1c0b031d4ca8aed2963244f270 SHA512 7f2824af00bbda537ecd841fb7e9d298682c079efd5b27a5d9f78af3410eee8e30b0a5314ac24af7a4401b7425501f1ffebff8c8549899f702bbcbdd263b046d
+DIST genpatches-5.12-14.extras.tar.xz 3408 BLAKE2B 35b8f90835a53d0a06b6f0f405e9954dbe7c9d5e4ff9ebc5cd493c08f40a07ec4e91d7fc8c58e00437020925da11663a73d91a7d1adf176f553c2f83742ee6ea SHA512 9939e4cbed0aa434a3ea11b520a1a65dc91abfdaba6a87498b89afd2dd95aaf570ee0c72e153582aad5c8ee458722dd3c40cde1a35ebf69e5ccddaf1966e771c
 DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f9030e82cff6ca09de9645e178f5976daf8003335ac2a9163e405282096bba6057ca645f81fddda41eb7b10f1125524b4cadcc5 SHA512 dc8efddc386fc5350802edb5f95f62f61a8d3c2033a0efa0fe9450ff0ba84a65cbb4482a0de9fea6f67200fb938f3d73c27124f9bcf706485f32f25cf8e89cd9
 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
@@ -61,6 +63,7 @@ DIST gentoo-kernel-5.12.12-1.amd64.xpak 66332975 BLAKE2B c1ff082fa8e12ad8faab5b9
 DIST gentoo-kernel-5.12.12-1.arm64.xpak 60233927 BLAKE2B f132efcd02a435b994591d3e1ff277c6d65f9412a0122ef17b808666f11ab97414528f40e61bcecde0b7a40c0f06c5ad5981156c17ab7997865358cd342ac640 SHA512 df7ce3a345a7eb98a2ac9750d6b1d2039886130e514d7f84b4c4f64afc3fdf3a2ccb238c203c73242a4863e7efe5b4f779de66b8054aedbc97bbc1f17e7e1616
 DIST gentoo-kernel-5.12.12-1.x86.xpak 58065273 BLAKE2B 7acd669230139ee760f566df9fb94b5e5fb686dc5bd1b854a1c2516fd7f86b58d925ba883c92f27da9e6dc9c72ba219d02b1da8eafae0bcd580be132036c7c41 SHA512 306d5281684d6e16321eaf7f7ceecccdba5b5e3bca47d75298e8a61a4849af8a01dbeee6ec62c1685f2a2c7418e3922ddd0b5d216d54756e70f898b0033caee2
 DIST gentoo-kernel-5.12.13-1.amd64.xpak 66367685 BLAKE2B 5003780ce8ce24b1110a8e78b919fc3b92da0cd94f189d75a6d66f3c8a47b7b52d6943c411a1f2f4dc3f36c4004859af61f3faf0a974cc9ea14a6b2c3376e9d7 SHA512 75f3c38008cf79c789d3c890c8b7d7b00c94f94b8711967d684a7d5cfae088d88935f7fe0815603ce6d0e21f92e956c7afc40cbd7f09675dfdf9bc572a648adf
+DIST gentoo-kernel-5.12.13-1.arm64.xpak 60225483 BLAKE2B 1bfa9a9a4e3fd86c5ea134527b268e2a646880ac68ee8804b1defa7551aab4fa4405a0e383cd5128446fd9f126dce6a0aeab95524d9674ba013cce512e7a7ef7 SHA512 1a3b12bb5435ca7ee194b8263aa19c3b13bba210d357922bf11f6d974b3217a55c6b85a5df98b81a31444a24289a14d790be2fb658973118d69cbd2f7f1e2a47
 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

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r1.ebuild
new file mode 100644
index 00000000000..9cc54d1c175
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.13-r1.ebuild
@@ -0,0 +1,115 @@
+# 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##*.} + 1 ))
+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
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+"
+
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+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
+}