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

["Michał Górny" <mgorny@gentoo.org>]

commit:     d0c1a95f4a3b0a683b9d121130cf631844bd2f46
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 14:12:29 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 14:14:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c1a95f

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.10.122.ebuild              | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1b83907d1f03..592cc5ed84c9 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-129.base.tar.xz 3527080 BLAKE2B 91778a19b8905af40a0f80cc634
 DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f64412557a2684d0d53b1243357b0c5d3c521cad0cc5d72af7cdfad1fe8304454a3b1fb8adffd797aa0985353729911c48e17342 SHA512 69db79779a285aa4127339bb11bd77de8e2d9500eb85fc582473bf487a36983edff85b475bcee41b55417895503bc6799ae17f8260e056efcac43f88ff9c64a0
 DIST genpatches-5.10-130.base.tar.xz 3642656 BLAKE2B 6627de9e9ff113ed2a29e3815d0423708fe00b15f706b48e410b0770a4e78f848cbdeee48f0b5012f397f05efaf66c46fdaea888bb8b483c1c1d8c81998b0b0a SHA512 ca834e87815d241326de8c0cea3bceb31909103f86f4d569dda64784b959744200e6b10e794d8527fba2205cadb47fb31a7cafd183f298d67969b96a67146230
 DIST genpatches-5.10-130.extras.tar.xz 3868 BLAKE2B 2aac33beea74a4cec64d91e169444869d280a2b6ae3a03f18f1c9f2d7f212dbadad157f3af828edd2e2e9212d08c50fa33dc857f28d4a67464ec7256589dde77 SHA512 bd6451ee386262857c379d2e46a4e1929ea571dbf5f61b85f5c63e44684653d5dd0111e30929f73d3266ae1e7cca25e6e050935eba7d6708d261d87e6e633d6b
+DIST genpatches-5.10-131.base.tar.xz 3676828 BLAKE2B d16b120518abcd9e58861a9657189345f5fc113df3c291ba350f895092519972fca6757798e619725a5da3f833a712993a089a6c34bff53be983a6f0ea97096d SHA512 62ca509f6f43f996ab6a6d8d1effe26f999e2503fdc5ca041b6ec8229c09202e4d35b8a3e79777a717e6e2491560d578b8cf9c35fc03cac705c69e14f1d435f3
+DIST genpatches-5.10-131.extras.tar.xz 3868 BLAKE2B a873f7ad0c932107ab45a91981d89886fb65e5271bf9a9113d55404405c2a592286fb86dc1c24776601707494db6994f0aab649eb79cdc990843c3194114e8cc SHA512 e8386d12ea62a190315fd9097f148d01edcf9c6fed85a631678e1b85f64104fe580eaf1638b4ccc10cb83cd719522ca6b0fc23ebc67e72960e8f045cb8c13bcb
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
@@ -56,6 +58,10 @@ DIST gentoo-kernel-5.10.121-1.amd64.xpak 65730847 BLAKE2B 939734688bd5833ba7395b
 DIST gentoo-kernel-5.10.121-1.arm64.xpak 61063579 BLAKE2B c107b3e2e40588b32bbd4932b3394032de6c3bd4ba9b60fe26bf153eef721f78beb29c0388a9c5373da8a90f2d6da897f30be364e3c5eaa19494848b8c6cd9d6 SHA512 b8ce380be7e704a064303b5ee5024ae25e5e1b01327b39df9e0bb808289dea157645cd4a8b96ba4050cd34ba0521654d7a2aae86635f54539348b7b1d85face9
 DIST gentoo-kernel-5.10.121-1.ppc64le.xpak 55835020 BLAKE2B 9a3efdac85fcf1769fcab6d724113fce8861d03d7e8d10896f53965d5f4d920019b14e9e697f2e47bf3ecbf53d2646dfcc3891ffaec32eeee08df85db7039042 SHA512 20eae911890d7573209742a081c62c8e925715a3a51de93d35c1ddf1ae863970deaa658f2efa06001ea2640c580a712a2cd07d991f8e32a55dc12d71a2bb3e86
 DIST gentoo-kernel-5.10.121-1.x86.xpak 57404240 BLAKE2B a3932083414fb97fa908765ec377afddeeef4cadd392d10ff999a6d9182e449cc6875b78c7e0e0b43de3572bb422f7f0dd49e3f7688c40cd78c5776214f5b745 SHA512 8a7a46c97ccb71302a215fb724063c3217bff513f24b12916e9f6447d1b9be58c7db30c75c70664cd31a1210751396c79485b7bfd3a87f59d2798b1f54584434
+DIST gentoo-kernel-5.10.122-1.amd64.xpak 65790411 BLAKE2B 40a40ba6542621cdcf5a743af4f82a4bea0af13f0e91cfad100d5e555aa74c618451ce584a5d79e5eb1c28ac64c2e1cb0ce7267a17ab5ad4da8d825e6bf99c41 SHA512 86fac568910c740e3dc2b03586b52504a88107684f85205a7f9cab947d7b5d247f6c1d635f557dd0bae57f374871c2f7085b031f28e151f9f44ca30256d10a97
+DIST gentoo-kernel-5.10.122-1.arm64.xpak 61055506 BLAKE2B 64588bdb186c385fcbd6073fb8a41060cd4439ad844b4df5213cd032a117fe32ddce3e0209af6c944872ea4a6c8077b5538522f08842125b9b93d4f5723e9133 SHA512 9c356bc9c05fd33af9fd0136f6019027fa0f41495d9464b374a71af23a66d662a7dcade5a3c3beab185a8e0404faebe871dd98a1c4347b89834244f5595caddf
+DIST gentoo-kernel-5.10.122-1.ppc64le.xpak 55843098 BLAKE2B d1a41b6dc9c81d7c49e58405666708f5f3216899440860d32f0655acea04d23f7a9e0db5d415cf3a93e0e40ff4586af0b52eff7371c7d06ccd0605be51343788 SHA512 a99925b5e659caf6756461453b099cbea9d28b47ccd0fd2f975f97d006478dafe2522a21679839c9b075a5fa1cc5a741f7bc18dfd738c67aa0e1ee5ce92a8b5e
+DIST gentoo-kernel-5.10.122-1.x86.xpak 57455290 BLAKE2B 9db42c0ad71207471f116b9eb0555e96d456cc2a583247d20e21eef7ac49e79bbc44e05a33e0313bab225b09798034ae8355f8bc06003f2d8d6ed74947dadf79 SHA512 4e2aecdacb45cd2fa9bcdacf84b3ef9abfeae25419d8a39075a31b202cdd130600112699caeafb91d6803d1675d82be72548e000e7a4f2188adf383f7f86b15c
 DIST gentoo-kernel-5.15.41-1.amd64.xpak 69349403 BLAKE2B 37462257c705fdf3600bc45d4b6b5564346457105ae7f7ba4fb655a8a2b7ff91422063052ccf1047cf0883977d4e3407b11d0cc604b68cc9ffd500503dc1f017 SHA512 f480c67532576e5dac934aac7418e3eae3b23b9ff73645ba9243d67412897307ebbd798edc1b195112cbc5f84545915dcc8a9004754e70c4ff56b9ff94f9716c
 DIST gentoo-kernel-5.15.41-1.arm64.xpak 64219270 BLAKE2B 0daf5fb63aabd71a4e37c1c8ac0f101957366ada93143355fbc4924bd67611f6c6c02cbf37eefa4524f5957c5374ce548bf754f701bdd8543112e3ae25a58c90 SHA512 d1cd5f83f7a759dc4263f3fc524e1cb01f2ac025eaa22c18ff803491a5a599c3f67ca8e06610fe1d7dff11b48f95abd599d729f53f77107b7560b2a1b4d67221
 DIST gentoo-kernel-5.15.41-1.ppc64le.xpak 57887862 BLAKE2B 6311a4bcb222baeb0a9d0a4d52ee33c6b06098119e0b154ba2829fb88fe12a1085b753738ff0adaf7b4d4bda9aa119e3fa599eb2be85d3a8a3ae6da2bdf29b4d SHA512 fb2a8e31f39c7282b7b01161ba6823ed96a8662bd741e8960bdef2940302bd8354973185406f10d20df3f3a9dbb1b8b04e44d6d6ae3cf85351654c34fda3d273

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild
new file mode 100644
index 000000000000..da84e07f808e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.122.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 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##*.} + 9 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+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
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.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 ~arm64 ~ppc64 ~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
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.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
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# 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
+}