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

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

commit:     2376a81974d21e4f7582269b28e75698d119f67c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 16:34:11 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 12 16:35:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2376a819

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index d052ddbfbb67..73c73cb402fa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-122.base.tar.xz 3383656 BLAKE2B 78310ae21efea3a38f91ee0a511
 DIST genpatches-5.10-122.extras.tar.xz 3864 BLAKE2B d8525daea96a3cbbce6eff0ff46be6a7daea3e5008f6805e2a7ede7e4aa2211b52da3b413fb2b542e8720410471aa938a5733305d925e8606b6321c39472b021 SHA512 452582a28be8c6c340052fa1d58a0259c11bd686abdce28b75ad117586f557e5bb188670599a8373a8b3ea01057a8344ca0f70cff13e854adbb8b9c3bf1edf29
 DIST genpatches-5.10-123.base.tar.xz 3412080 BLAKE2B 8ba26d867b1cd10c372bf059c00f11260af3bb43cb636519cc4c15916359e1a74d24e58732dd0c5f4db0cda8a110360da310d6ae761e7df2a7f4e424d16ab3ed SHA512 9e0325ff0bfff0ecd56ac7d7c82f456ca2697c8eccb584798f5471b7a1247d6d91e71b39951bddc2f093e0e16f5fa71a510932359d1c1e8ae41fdb4058f467f6
 DIST genpatches-5.10-123.extras.tar.xz 3868 BLAKE2B 4999cfc456607422df7e8e6966c760feb8b3fffc9bab7d2923b7de3819b94c6778c1e7bf19092fa42125fa73dd35203e3c8c002e00cc62a2978f375b24d86c57 SHA512 0a9291ab36d1a3eb69f423add4bde7e4fb31c5ba318c0d9b3f235b167c2506273e9cfab79f264891d6859d7b3c5f205e689ac37eef0f16b15ff54a4da12ceb2d
+DIST genpatches-5.10-124.base.tar.xz 3428172 BLAKE2B e1393b6b91c0a5ae3cf1ef74ed569ee5bcdaf3bb5bd290caa65004d9de3dff216e3121d5c6de7cba454ad6ed0f9df757d55fc31ed781531d222ddedfd800fb29 SHA512 1b2031bcd2f01db14686d9e642edfcb47c2ebd8e740b8d4af9310e4e9cad5a14e48ed7a72ad17ef001f4db04d519daafa4bc18ce197f97bf3ec6cf7a53cc61a2
+DIST genpatches-5.10-124.extras.tar.xz 3868 BLAKE2B eee2a113c7def23275fedd1125da016cfdd468683ecbaf187f79bbae29ed9d8b1c93d36d93c4e97aa4a8f2735dad29ad4cf75447cd5e5908dc0cf19661a18358 SHA512 83612ba5da23b29037f6fc24949e7ddf9169cf4ff444f2d3110ad7da09780932cf50a763d5bd6bf02e318233f4d245dea835cd25cee954fe77bccef43432dc56
 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
 DIST genpatches-5.15-39.base.tar.xz 1659952 BLAKE2B f40154102f23ab2b7774a998c75633598ce83daafe720930ce151a4af2a6e3647da249ffa299c7abc95c7644f51b044c4e6ea7a2378deedbf09638243c6cd30d SHA512 7646cc2f7b9467cc56bcc3e0e80475f3137eca6633800a8160d66cc81aaa87968f9f5fa6b3760a1c0ff7351d77582776a2c1a24875933ec0001ec0caad8818ea
@@ -48,6 +50,10 @@ DIST gentoo-kernel-5.10.114-1.amd64.xpak 65779254 BLAKE2B 7e524097759b128789c04e
 DIST gentoo-kernel-5.10.114-1.arm64.xpak 61044469 BLAKE2B 1cd8e49b30fba758ad1a15aa38e132f6b60af1e8541a7df988cfa54cdddd21ad94c3e461137acd4a4fbf14e0cd6449bb3864e2c559365ac4c19ac7e72af806e7 SHA512 8e9a5480054cd9ff1247418f359aa2e86925350d684e5b819ae37511aa07e9a378e76ad7ebde4d2d804efa193884605dcb8698ad65264fceb3b9cc31a5665872
 DIST gentoo-kernel-5.10.114-1.ppc64le.xpak 55866738 BLAKE2B 4a8458b0ef54df586b467bfa929685b3c734dd2e7859d95dde260ab99ae047bff6f4dff0a06c3ae7a41f228a3f10f2e83afc718ddc23785ead79433dea973228 SHA512 864b4b3f39fc27aaa1f64aab954122db3eadc359c5359c8f0f752d028d9350b1253b7b2d2cb2ff18ffd7521fb6b012dc23eb9ae532ffff477b47f1e7a360f90f
 DIST gentoo-kernel-5.10.114-1.x86.xpak 57386747 BLAKE2B 77833a4c8fd77e3a31f0a570bc7b2bca22c92f49d8a1de6d73f359356a7b7f19c0a1b24113a904de320d387e079073fe76c4277791cbb4f55a2f7cf933b26898 SHA512 9a72cce1130027be7d8288d07a1b9aa43570ad590545a398ab562a07372417db87dc235f91f0555635081c48aed6052eb074adcd7e3d0626b15a8aa05b17b6f3
+DIST gentoo-kernel-5.10.115-1.amd64.xpak 65710638 BLAKE2B af977351bd21db362a58b320a95ab71a57efceba784586aae2a8c07d729bfc763fc1083c45a17d61ce61943426518226964433337a84f89df24ac93bf8605be5 SHA512 83ab5429cb4a5bcf541296ec043745a4fe88e98152f4ddcd0755fbdec1fc57f6ee4be13df535eecfee12e0e339cc640663ac30eafd578ccaf4fc3e804657ed27
+DIST gentoo-kernel-5.10.115-1.arm64.xpak 61062049 BLAKE2B 91434f125396a7a7fa7fa980339212145a58d47088297e2dbd0654c7365618fb2a81ae80cc78363fe741386d31889ebc88c4756cf0a39314cb6b182ae09048ca SHA512 180dc5fc7674bb8671b4958b7d4706656e5d4e82fbcdc3b5bff998cc5c5d5751ba5ac12e040837e55c50ffee7e1969d3fae486dc389c5bb32ffdc68dbe78324b
+DIST gentoo-kernel-5.10.115-1.ppc64le.xpak 55868209 BLAKE2B 43069e5d92c058af297c4e8a12fc5bf7e25474299996b9213c7ae20f208595adb69290052a87d02959788e21ad8d27c4a678b949147d1bb9bea0d78cc441482e SHA512 353199d8eb47226980d11defa520fbf0ff07f309d206c507eb84cab49a3af5699725e03c2c5e40d776004241ec2f3c8f3776c6f048be82ddc56471cd271201e3
+DIST gentoo-kernel-5.10.115-1.x86.xpak 57388237 BLAKE2B 3b83f741fab3651ccd2128b3545c38b59449040223d19a7789d02235d8bf526985174adc2de6e6a1157ff01a27df9eeba5e661b8ab4e60c2f80a5eb964fcf5e3 SHA512 7b07f89179448c695ffa59613d92ec1a31e0c57459912c0044a7899ab04442f1b3e8266a09383de06e7667dd60998a90ff30d7a4e5833c7356418eee9ac90aa7
 DIST gentoo-kernel-5.15.32-r1-1.amd64.xpak 69326816 BLAKE2B e26042a6d9b77d98d2d49f5f00bba7128a5498f01b4309a0d24e08f4d38f9b9b166bdde135aad75e005f7433af331c9bee60ec166abad8a8ccd83afebcc43dad SHA512 040cd5784b2676d58ecc7b24a1a9316ad96d2fbe03add3b4f9b679285b25185a6dc1bf1ba1a40c816763e7088bd40a185266dcf535dbb578fa5a005453ef1f21
 DIST gentoo-kernel-5.15.32-r1-1.arm64.xpak 64197193 BLAKE2B a50633bb2a4b3c7a1ac5df5b38821b7df24f15dd883169b6e91c6d934508166fd6236c4dc3640b0bef994b7aa97551ba9b9aea8ef4e6ebb80b9131c61945045a SHA512 c4e922dd2bf942c6be335387e4266a1ed3d27ee466f7db3b4de24774e20b68e5fd2f62c5a3cb2f84db7e520211e1dc6f0c9f27040039da372cc37bafe06ac15c
 DIST gentoo-kernel-5.15.32-r1-1.ppc64le.xpak 57890732 BLAKE2B 7e5ec0913bf2cd77bbe726e48bd236867a7f963777ceb2cf5dc86a410e98e4c5af5888a75f304492883fbb821813a8d6428664d21c55af1a36e7ab7cc9a7ae0a SHA512 c77e1e4108b06a46758209bcacd45bc42dffdfdc273290774550b8dfb1c7a4bd287db95dba4dbcf17da88db9a0a6a04cc14a20f75dcb9f467d7549dfdf9fb33d

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