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

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

commit:     4acb929403bb7a60684e6bafec69e00fa79bfd1e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 17:27:25 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:36:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acb9294

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5b05688d4b3a..70a40550db48 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-55.base.tar.xz 2235252 BLAKE2B 7304a492e04d83ec505c76af4f3e
 DIST genpatches-5.15-55.extras.tar.xz 3932 BLAKE2B 50132ad9a1b3a9012ff46cc2ed8c0d18ffd7c48aed1c481eff24e4757652e3787172049a3025b2586092382c827c6d139930d157d039258d07ad228ea716c12d SHA512 188abe81e73bf1a809125dc634e10be8427c1d11f696f4ad7fa60a0ba269773278e3a9e568e3640f7ad8fb8f4736de7292a154b05f8f7bfab4fe1fbe341bceb8
 DIST genpatches-5.18-10.base.tar.xz 500696 BLAKE2B e6dfe7b2f752aa0cadb2de11ed7e9e77935abf4d61c99fdb4f6790853364c8b8b189d25b2190b3c85b51ef355b085d1ab740599a920843534f0d4a840fbe8733 SHA512 d425826ca98a5600262485aae057401c131e63b2b84ef6eaea287a433acd4b0f98e3899bd931ac73eda5651c57bcc4bec730469655d54aa1f176ebfda6724aa6
 DIST genpatches-5.18-10.extras.tar.xz 3924 BLAKE2B ea024b19777b6fd59ad5505eaff41db7dc793f5f29beca1d70c2ab60829f5864f1b78f9b809fa9443f995f70df82746d33ac9ce9453a564b77c3964b49afe822 SHA512 7468faea1020335f546c69d331aa864400687056a01cb54a888f3d4bbe6c9061fc2a5d519f93aa362b87df953bb13c06ea2dda403e48f63ca259a6990120ff5f
+DIST genpatches-5.18-11.base.tar.xz 547804 BLAKE2B d0550c546e93b806d96c8e64c5ea90d22f9675f2c6a020032ce5e35b7401601c79d2849c0d82cc53673e6c22fafc975035509079253f235c7db769fe20670e59 SHA512 4301f61e38ede94fa5c6e02f67e22dc32cb1078463aaf641ac81d959444e8088c1e7da6c3ac7d877f1f94777bf14de1a24207caaa8c560fdfc352a6972ea5b47
+DIST genpatches-5.18-11.extras.tar.xz 3924 BLAKE2B de48f32f46f5d8fd8cb607490eae51338e6e7e94501e2e1ded2c990274270d80c7a883ed227203cb7306c0259f8dbe226ca3ae271eab76e367eae0ca7bd653e0 SHA512 bcb9190ba00f1028ede7ec7c18615260d8de263f508cd9c543938c6dc0fc9b0be856be386af4a86770562453e094e1794fad064baffdcb4363cb128abb35fa75
 DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c7391bbaf26b770ba8d4b657b923226a539b7b68eabab6f12bae4bed09a0d198917373a6ab4f707831c652e2461a49f8dd4981 SHA512 057a00d62f4d8ba7be4ea26aeaa4bfbd5581b22ded85dae71aaa693621eda17532ac00bbeaaea1689f552ce2b95a04e9aade603f6236c2a265aa8fea8231c5d0
 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
 DIST genpatches-5.18-9.base.tar.xz 495452 BLAKE2B 244e049522e9b8586081b9eac59fec51184c532bca70fc1d451af1ded646df9bdc7e047cea0963fd07ae8aa04bd4158d64854a2d790ec90be37aa467c7e8b646 SHA512 b90abf747ae92bb4ac7ef94646aedc21a89080d10f8aecae63821d59c0ac29b3b94c0fc6b862d87eb8b86442c2d41cfe16e3a1341d3c146d2b3c678c2f2cdf9a
@@ -73,6 +75,10 @@ DIST gentoo-kernel-5.18.7-1.amd64.xpak 71572166 BLAKE2B bb603514a140b621355ea60c
 DIST gentoo-kernel-5.18.7-1.arm64.xpak 65215954 BLAKE2B 5a3e7b3b506530a63793848e97cee9572aafa4f131a2f99673797dc6ec8836ce721257307a4a8e2fdfa9c29d0dc17b0b9c2f7b7f93bed85f2b321c37a8a7876b SHA512 686ffd33c9a4dd59cf20732097fd11629c7980aae1380a9a0085fffb121ee3c7cfcf8a2ef0ad62762b65c447fd3f6e260ef73b5cc2fa3408b2dac43f58bec94a
 DIST gentoo-kernel-5.18.7-1.ppc64le.xpak 59445100 BLAKE2B 229e12e0b6b531f4daf17355bd768574cba2b86643dfa4081834178624101d2945c41482be9bd7ec1721b640627cd1abe78e5a011ceb459e3f075ce0a2b09af0 SHA512 e2e71a52a66f6da676104dac7b72f797bb8b1120c7bf48c7af4038c2d49d84a4f4bb6680e37bac5a5fc445dd398f554bcb355dcef2409037972bff62689de588
 DIST gentoo-kernel-5.18.7-1.x86.xpak 61803855 BLAKE2B fc8df0a64ee5ace42e51a67b22bf9e7715058c5eb8f350e69227e940cb8b033b84f74ae926e587686e87b77f4d630e4516f8c417a2e10bc55ab61fe866202688 SHA512 851de56b32cd990ba56fe1cba50efdc107a3f2d6403de93df689c6619814dee00c05efa78366d65a68c25e4bbb1e6a59621f756a0c7c2388e86cae97073681eb
+DIST gentoo-kernel-5.18.8-1.amd64.xpak 71607092 BLAKE2B 7ae5311031dc09880dd86ccb8c684a5f75ba61d9925f6794a9e3dfc064171c8277b89f0c0355bf1feef769bdb6433fe6186f3ce3fd4442e7656bad6f658ff7a0 SHA512 2f16fac3790a602af43f9802b6755ddc9e28707c15c2c726f21af9399b5b15c010385d6f894beb042558bc8896a71ad72b4a519b9efbd16792a43c51dc62efa6
+DIST gentoo-kernel-5.18.8-1.arm64.xpak 65226488 BLAKE2B 726a8b44e0ca762756ab6fe0464633146b36124e7f28ef29dbbebcec589e49e17f68d1b3f61745cfae6f9d4dc67eb19064a7389db93a61d64efae18d77c9bb9c SHA512 99a546cae7f3267fea1eb505b659b17eca7689681b52027cc78edcb00d8da6262c92da1865aa372bf3912715b8497028a29e6511972fe8a3192308d92eed3daf
+DIST gentoo-kernel-5.18.8-1.ppc64le.xpak 59509025 BLAKE2B 20c92daf5cc7300cf1c326e3043dde4b3d674314b83a03fc829639fef5a55aa7c4358aa1945aafae7126133961343ccf06b93daf66db2c7bcfde2924468b4a02 SHA512 06038c92b1adb9f567ee225de78181158487a0d7e95519dd69abad1d18bbb8c60bad879a24ef4887859aad439eaed3d6a7fa2eb665f93704465c2e4c7a9972f4
+DIST gentoo-kernel-5.18.8-1.x86.xpak 61809295 BLAKE2B 49b4841cf6925aeed0f4bd12025876e15e8cdd4f23afa7c538ddbe144892a7c304b916707eb7af0646825dce781959cc59eac6f94d0b536b0792aaa448d2929f SHA512 e9e5ea4c4ff4b0686f1d48012a4ec4baebbc8aad7704b1956a2feecf091b57f22043777e95e3fbd42697a2fa628218859ab7e09132d634005cf8b28fc89de801
 DIST gentoo-kernel-5.4.199-1.amd64.xpak 61557691 BLAKE2B ca249eb416d775e208023e555d6064f06b92ceebc765807faa9789a2a79d00670b95e7c6ac1c635f131e5b8c8dd38b47a98666b1cfcf9a0b8dcd7b5ab3212332 SHA512 51d3a1978088f3932127d10fd91e6219ccf2bebc17963751b57977c036f878aa13ba6d55abca167966f3061b5f0e6aacf71ae2096e5d6dfbf3c5fba6da3c2aa1
 DIST gentoo-kernel-5.4.199-1.arm64.xpak 57705946 BLAKE2B 882c6b7b3444c2acc04379cfdf9d70d373c04496f9c16788e1b150851c7f64b76bb02e1fa5b77051ad50eca623e0bebc3066fa398622d82b24b6535158817cc7 SHA512 625852a1a45afdf0436025fd1984a243ab4b2de1e49bdfc323b568f7c7e0798d4e88677fff90cb83b4ab25cf311cd7d2cd818484880c9e64dbaae414495235ab
 DIST gentoo-kernel-5.4.199-1.ppc64le.xpak 55122976 BLAKE2B 75bd061e50e6528beb4436072b4d13c9f224ff56e05c08ec971af8d03a4b8a0e93bf1654eb82e78403af7e247d532a707fb5a8af9c47aa4b7996d5ee839a8ad0 SHA512 d10eacc72d067ed7546c6622248e2dba8a713794457cfa1b2e1ff318fe8d48793c3e6e46cf78101191677ac656e5d9960620bbe0ac4d721a36111d9f9bfe8de5

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.8.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.8.ebuild
new file mode 100644
index 000000000000..bec229c85248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.8.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##*.} + 3 ))
+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
+}