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

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

commit:     2dab0cce0a4ea7b9ba86dccb1d0fed3ca44ea7a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 15:26:51 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 15:30:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dab0cce

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e4ea14cb48c4..7aced247538f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.10-145.base.tar.xz 3914420 BLAKE2B 0d6f00cfba2ea5bc70bf44549e8
 DIST genpatches-5.10-145.extras.tar.xz 3868 BLAKE2B 1e6d3c0402bd46656c9f524ff9b309f4d8f4ba85be0dcf210774b5975d85d2098301ff8e6b33fe419d1bc70faf0a4d1d7572fa5c70122a5508a66790a2f18c4b SHA512 d51bcafbcd6cfa70b9aefddb416020363720c152944edba3a41ae152c9b3a0ef1ca3fc70252d9a75b0b636c3480890aa8bd727e18b699d789ad5b08fd065cf7a
 DIST genpatches-5.10-146.base.tar.xz 4033504 BLAKE2B fa3dfbc67491cf219ae495a47fbba153dc6a9609a28b4d195d3ae0a179266a36da8f6c34b4c3c1af3bfa0e19ae85e9f670f080124a6c4b1910cc7f2b6f900971 SHA512 e55d819e0cb0f5cb356a58c8fe3a296dc3066122856270b2f43a868d48b3d6b36ee0c2649c5f59709000c9054eac8d6d5f0b94b6a7f2b6e395d7c6c2a8d76f2a
 DIST genpatches-5.10-146.extras.tar.xz 3868 BLAKE2B 968502af5c3f60f744f5b18dea3a170136d6101455ddef8e03b42891d482dc1a5b49cf7992473d993d4006fe086bb0f8bfdba1ee9726db5e6449fd2a82b0fb53 SHA512 923225b3be6c99d15fe71bc0e13970315decbe814ed929f35233e5a478df37b1e6bcc6bde45440f33271f75d0d35a2b99da32625f813444af181dae729bc9c0e
+DIST genpatches-5.10-147.base.tar.xz 4073808 BLAKE2B 0e1214facddef3b26bab742ca4164773162e6954996bb8e5137707c6728e0deacd4bd2679f276edc0cd03669a0d03a5c7744918efa1189877e38608dc393d065 SHA512 84f5bc607c10a08a03c8afe8617719827588b49ff9ca6401fd128806ec91fd6d07cfff6ca313f5a49e9a1b37b9aba2aff9bd0f597d65bb7c36236e148a04b397
+DIST genpatches-5.10-147.extras.tar.xz 3868 BLAKE2B 1f12eea29cda808c434364d0f60ae931819a53d20bf632a12f140c47a001387987688eef1a90a31227a6ccfc217c5db3839d06527a7bcc1877d30c98dc47e21d SHA512 492274da82c010f4d7f33dcf623789a9be51ee711d19076657b091b1e91ed70ff6010aba5e7778c9769eaef28216baa01d3f373fb76c595db38b4763ff182740
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.15-64.base.tar.xz 2531728 BLAKE2B 9e4501d9a9e423b50d1cea9265dceef035879be1f16b9745aa7bbac8370f7f79c4e6c36fc2f3971a7d766a00fe6bab585148433601ca0ed30b40ca4a9a870406 SHA512 70d7c3f805b0ce6a9cd8034f0fcf22db203621c7464c7eb158a0d7a01dfeafe313934119a639305d02da25afc1852aa29d16d9d0de3d0101bc3bc4a0af18e8e8
@@ -42,6 +44,10 @@ DIST gentoo-kernel-5.10.137-1.amd64.xpak 67587812 BLAKE2B fdddb65d57563087334e97
 DIST gentoo-kernel-5.10.137-1.arm64.xpak 60983065 BLAKE2B 6dde677d0bfa1caef7b3f8d30f26903f23124eca793b6c2fc2af6a0ee8f35cd19693fc4659137e747d4a8e52f8c9c873c70d5c64c09acabbc7ae14e3c87b6d82 SHA512 eeee9533c565bb84bdeb1a39d8d5d801fec56931c65fba8ca38800f44a176b6c706ff4b93f8a45c82f5d61cc36d3070d8b9e1e773d218d57e86e197566470e56
 DIST gentoo-kernel-5.10.137-1.ppc64le.xpak 56039316 BLAKE2B ecbf38121bb33144d05a5a5d9ebb479edf8050aedd3f003d9376d50d0b711078b0be8b41e513d8efed1f1349ca94a565681b7e0d36b6f9f541d415fca879a514 SHA512 fb4711a8e8fccb5955714266eb15233d8d1fd95ed07a67ba5520c9ea96122018cd78e6ecc60fc0567ddbe70ba5ec6154da50e411c2af30992508719dddf01ef8
 DIST gentoo-kernel-5.10.137-1.x86.xpak 57486569 BLAKE2B b6dc9371f148708173cf0e6740f24c5429248705bad596bfcac130f8b6d82203569949d391158322dcd561f310e200ed517229c4e920db280400e9af4d869881 SHA512 33ec7f76805fcf2bb13bc7c6a2afb2cfc9bca2beec97981c0b0db317f08867c08d0d14c8471a8150373ce9775da918c6f37b8801e6168753e5183783176a5533
+DIST gentoo-kernel-5.10.138-1.amd64.xpak 67522997 BLAKE2B 16679700f076e28ace346487f411c653cab4e11b391a32982b8165239121430335acfeb089f40a16261999ab36147fe259025edd063935ae9c036d38130e705a SHA512 3f967bbb188cb178301d22573e73a9791d569caf5f5452a518ab639d83dca5e8992eabf2756513aa92075b70992c7de92b0de773dc674f26387b57160d386b38
+DIST gentoo-kernel-5.10.138-1.arm64.xpak 60960935 BLAKE2B f194c6e204b9efb8bf882681aed20519d3cef06dd91fc24d805fffa00e8508d0f39f244b10b896bf153a00b885e518fe766654f8d450ccd4f6d6715fcc12b210 SHA512 49dc2766fd8dbf7d77d93321e1ecffdae6217f95b7ba780de961fbb11030c16060e3a611cf85f7266e92b6bef7a55c96d22bc4460f2c441afa29809615311a35
+DIST gentoo-kernel-5.10.138-1.ppc64le.xpak 56016873 BLAKE2B ccb39d42bbb9aab883ee9ed5c318d4ea1770ff969028a2e18b99bab07521309beff55c30b36eb189dcdc4259a5d8b9e083b37018481f501bef781ca0b080a818 SHA512 e148844d86e8a9bf9158c39067620226dfc5727acf7c8f21d7cd85b7c3b2123ec4d6ff727ce2c2890ef400b0b2fce0aedcb2dbe0b6fa5b140d6e2959a10a29ba
+DIST gentoo-kernel-5.10.138-1.x86.xpak 57436076 BLAKE2B 0ad4e906020ee3086e0a4668bd623436bac3429f12be21fd148fbe4db4d47a34df04f802375ad5ae6776245b137c4e37eb4665985b55001957a2e07fb7370a97 SHA512 449ed2352f1cd7eaffcb90287a9c71a7789c714169ba4583ee6443b2bd848ef3ec4fa49f56c52c50cc137c2104e1bcb1ab4bc0ffaeccc285215fb36f29d0ae19
 DIST gentoo-kernel-5.15.59-1.amd64.xpak 70780970 BLAKE2B 6728820f88324d719530871e41d40e80fe9f7324c6d51695687e83f9ace6f40e373f2d1e4cbbeaee671141a9036c3a27ae00d165033c21cc72d4e9154a402db5 SHA512 f6c12a43c6a192fa2b298903db53d6ae73441a659971aad990235bdb1847df79cf0cd1ca4f8ec4cf30a421b847be274c8c35dee43479dcaf4f95609473fdc108
 DIST gentoo-kernel-5.15.59-1.arm64.xpak 64214058 BLAKE2B 8c92101954e62c9ba3eddfd04726dbd03d254d6f506f5072dd1c7d725d29c498d480a1697513a3459127ab133aafc1657d1c9872beb7d5925adbb7bb5fc16ee5 SHA512 0d21c083fd3f971d2fbeae1d012dc03d4bd17bb37ab59e5bab6e87f171554e5ff19703b234c0fdfa9a9e3e98a295fe8037d49ed252a141603debd0d33149bd09
 DIST gentoo-kernel-5.15.59-1.ppc64le.xpak 58200347 BLAKE2B ee5d04f4455c9ed7449e06078f96a5372379bb11ab34b2aa3f39bb3d6941959a4ebcb99ecc3f47532944588c92c4c59078ab1a0f2a2d32b459ec6c8082546850 SHA512 63e9a38db9414b8851d274942df40ea5f35cd0200743aae906288a436cd0121e71e1a7541224a0707e261b51a1d474d5921838a134bc4597b009c7b8bf9885f3

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