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

[Sam James]

commit:     d9053c91613321b5275783d5eb28a34d426d0457
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 00:15:58 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 30 00:15:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9053c91

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   1 +
 .../gentoo-kernel-bin-5.4.123-r1.ebuild            | 114 +++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b68099d7c2e..96148c43dc1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -64,6 +64,7 @@ DIST gentoo-kernel-5.4.122-1.amd64.xpak 61399307 BLAKE2B 2b92ac919e0cf3f55127906
 DIST gentoo-kernel-5.4.122-1.arm64.xpak 56363698 BLAKE2B ce3e2142ed6630cb0cdf274709bed8ca9177af9df78ed50a743bb2535a8a926f31b7fe173c2b303d1929e1232eaaffab08317881a37d640e5bb6355c0d796888 SHA512 877abb1511e96406a6befcaa20e893cd1ce38949f6d67962cbf76c5bf4839d8ba1f174997a6d62e69074637f187ff2177956f5269771c93936e65b18b0cf6f89
 DIST gentoo-kernel-5.4.122-1.x86.xpak 53177302 BLAKE2B b71a2918e7f4bbafd2e01bde3dcdc7c143f8604fb374b310f22ba54d41047b1273998a23bdce5547dbcfe273a049551bf812e8ac2412810e3bffb03c94fb2606 SHA512 73064f5b903de74b3466191175cb0100db0b347449f46c9ea899be2e69632c3eeda14eaee6b919e069071829a77039752af903603c969e0978f71e580b51d088
 DIST gentoo-kernel-5.4.123-1.amd64.xpak 61368911 BLAKE2B c3252e04180c56eb0edaadfc6ad8c1b3416f760b2fc613c43673829774b661bde3e3fc59474cfca455b8fc98f9ada42141421d537658a75943c079ea34a981f8 SHA512 7b647c9b1a7c0f5db8c41a791efe13a14abc5a34ce2fa3913111e6a64c8704b2b949c54c63f887e9ea934d163a8b504571c83c6eda1dd4a97ca8eac32edde587
+DIST gentoo-kernel-5.4.123-1.arm64.xpak 56055188 BLAKE2B e7cce2cc33010b30c0929de502e204b975b692bec366ced27b878cd5c8fd62b51396d93d8fb1a8a4a5b01ea1ec3e2674a20c52285a26c623d4dd6b2659f34082 SHA512 840139b1219abc0ffbfa184f3b9c33ab5342874c2bd0244a9326d91dd186e97a61f6699c7dd22349842e0a617cc1c8a8ccf6f8e64c26d5c06b9848c19628ce0e
 DIST gentoo-kernel-5.4.123-1.x86.xpak 53189077 BLAKE2B 3bb6d0813c6574941c63aedaa0e12f9c7a332665c9c4a7ca4475b669c81bfe2cfcb73e603858eb4fd7d448deef5f801e3ebd374fb6c3fab90c393690f65f90ed SHA512 72e15a705b3be1b51952a8b126b3db4ba1897938a5405b83cc0df2319ed4c3c4752fc73e6623b47c77b08dc58d4178c2f92ba8b06927cf4c6d062c3e9cc0ff5d
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.123-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.123-r1.ebuild
new file mode 100644
index 00000000000..b63276300c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.123-r1.ebuild
@@ -0,0 +1,114 @@
+# 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
+	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
+}