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

[Sam James]

commit:     674959092f8a8433967deec37ca8cf88036baf1f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  4 00:53:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 00:54:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67495909

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   1 +
 .../gentoo-kernel-bin-5.10.46-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 1e5783125ac..6624c07e1af 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -47,6 +47,7 @@ DIST gentoo-kernel-5.10.45-1.amd64.xpak 65488471 BLAKE2B 81d1b308c05d0a2ef3da883
 DIST gentoo-kernel-5.10.45-1.arm64.xpak 59270155 BLAKE2B a1d78e6e9c32475c565974f9d18eaf30deaaeae3fd1209775b8d606c233c65bc21d3c9179e4be49396e740fbe105526d47b5f0dbc0d32f90dfd4ef078888a210 SHA512 246e7ac8584eac7568c666ca572b001ff7f94c3ccf9bd96833d69c695c1591ad89cf7c8be9bcd0dca5917ff7a28da4ec248347792b7b7d329eb8bb9c12488815
 DIST gentoo-kernel-5.10.45-1.x86.xpak 57212061 BLAKE2B 9fb4a758766b3ef0c9c0ed2229169930b761943cef6aecd5d82dbf60a70a92b4c9c40e20a237738e36ea35c887e46cb2898c9ba1c770e357910427c023e2eee3 SHA512 7e6abec71f771283e43ddd5a647843918f3aa979fcda6c336bf1f797ed1f8e144e9b8468166d6ef6c82652bba403d776280f7c21366a14459fbd4c5e2966c8ec
 DIST gentoo-kernel-5.10.46-1.amd64.xpak 65480369 BLAKE2B 69fef95b1daaad661467171df16ff1e3143bdf46740193351913ca752ed4c4f386cff57a57b9519b676ea02dade4b80152e1179f31c8a56b0fc221e4c9134e73 SHA512 64f99b39684fac2363e29e95a43643f77d05088650342f8e53f29d1ff2589429db1cca9ca3eb6ada83f987a889dc878e6e5f59188c236a112c20cfc8dba632b6
+DIST gentoo-kernel-5.10.46-1.arm64.xpak 59246438 BLAKE2B d263f86f320e8206f71eb1a80cc79b89aaa96efe722343e041023d2d0950e69ba3c6020cf2c984ff4e93c816cfa843e253e284caafb10fbf1b08d3bbe1413a45 SHA512 df4fb4cdc173135835508ef13f363406c9f9757eb1e67360f19e8179d067c21367ef783443086c348b2101e12fd1619292cf256ca90401c955dbd95d7056dc77
 DIST gentoo-kernel-5.10.46-1.x86.xpak 57216120 BLAKE2B fe702f3ff06d1394887c1c4ef91ea6e10582b1b33e1b8d821b07feec6f9a54220b0d1e878e4b63961c817f574c727e55ac0b9db459fb3d3ad2c81e7a838e077c SHA512 75d6cad82e5ef99cac80acca448ffaba9f03e2985fa78d4ebfd8c39c694ddf7b803a3720aab731987094428a9afc195860f3013c0e33892bdafcbee6f5455c61
 DIST gentoo-kernel-5.10.47-1.amd64.xpak 65480161 BLAKE2B 60863347327dbb67ba16881c01244ab01f7246267989018373a85c5fb479521f4c70574274a5b7caf98dd78f9601e80a887cc115e87f8004bba292d438879970 SHA512 a73474d584215180daf7c2aa9bd985b29234bcc319b9b8a4691467993cabd8c532efa611bfc3b13b323d5635cda556b57e704c11d8a43b13a3efaba8cb84fe64
 DIST gentoo-kernel-5.10.47-1.x86.xpak 57221591 BLAKE2B e069b66b20c0c9fe3ab35cea65dbe797b1a5a9b2c80b11d5e49113ace7d9df5eff6a5b1aafcd7a65f5df96d21796fa89ea75b825cfef61058a5f5af13f6e5c7e SHA512 14982da4f9fd7ac365641a5a7f6eda290691bf4c36d67a2f4353d1e16c0bd3e64e3c9cf47c517c295c229cacf70c157614808054b3b96363f128c71d6fb8abed

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46-r1.ebuild
new file mode 100644
index 00000000000..b63276300c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.46-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
+}