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

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

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

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 77e76a85ca3b..1b83907d1f03 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d641958137
 DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B f9d3d87c5aad19869ae7d1c82e1303ce62b5f10cd15328e4839bf7a7b39a2f571ec8b47dd65afa48f8d3ce98113a150058c59aea869f717a0f89316074af1d83 SHA512 17ce2facd53633f3059d9472a076fc57e320cbe802ea853fc91734d88e29a30b54dca75e78c7173d3333be5b96add590af89b089426059728473167408f65e5c
 DIST genpatches-5.4-201.base.tar.xz 4708884 BLAKE2B 3d6d82c90f3b8e2cffa9d9c1cd5bbe74536d44cd42c5d870272b8e87a2a99f16d338f8c28511864be87f739df53f3bd3bb2f7313b4b04f78fac2057778d5d439 SHA512 5ebe9454b61142e87e5384a5718399c4c99b059a8bfa0db638f20f2157eb2f67117d58f4d046bfed09725ba809686d93a382ce1acd63520b16ee1d8820530729
 DIST genpatches-5.4-201.extras.tar.xz 1812 BLAKE2B 4cb4f2605dcf2e374521931bbe92026246513251f53c94494d076f7da87a85dd5a2c27f4e97e72262853a90905a4a7b2d842258eeff573a8a3292fbf30c35c73 SHA512 a74d28f5014b43422cdfd8ea7a08b71faa6f0243cc1ea409e199d81e995e14cb6a849d3624bd766cf31f12a44650945aae645f37ea98079baa1d7fca6c89981e
+DIST genpatches-5.4-202.base.tar.xz 4790140 BLAKE2B 2ea183e7c63ce48f2d418ba4606782eae8aeaefac556f93a9e3358d1eb62609f431b973f0d54c006cf723e4172d73a549ed00229a82dd4f1e3717951b0cb8a3b SHA512 29f6a7c0fc679273180637cd70791b19dd1a6a87f66c46a29df2ed5fa01a5c043202853c2becf6050f4cdfed0e7ef2a7dcfbcf934623b85578a45ed3746a2fc9
+DIST genpatches-5.4-202.extras.tar.xz 1812 BLAKE2B 710012cf071fc8e65775bf36c372bf1d6743824061e8ba42cce58440dcb4e207ba5a97eac16e19c0898b991cb39e327ac0417f90e5b8affad9937c7030361e60 SHA512 75d828543b8a15e32bfde13e1fef6fbf83440344464245b77e401a69968d33de459fab3bd7668838650cca9aea3475139f3206001a119463475dd091bdca2a48
 DIST gentoo-kernel-5.10.117-1.amd64.xpak 65753983 BLAKE2B 1545c71484a187bc84f8bc14e8d572b614355d5aff1cdd8552575090deccc8e30024ab45c1a0592d34956cec402a527b41963b9bd9645b84a2ba3760b53d44c6 SHA512 536a8d9370eb97e68d1d3f0f632addfa7dcdb48dd8bc2dbd76a00d44f1456343b1a4c9646f4b5733e3583efda04b75f2b19a165c4aeff327b72201101e6ac618
 DIST gentoo-kernel-5.10.117-1.arm64.xpak 61048114 BLAKE2B 08e37c8b83d635b1ae888545a461ea594e2c3dddb41749b6c5a95712908900a09ba882ed6fd4c506cbffe144d14b8aad31f8e3875fd425cac28bc82b55548cac SHA512 a5b3f6fd37d3ae286fb352b125589c56dd2cc32eb92c8e4898189a717fad72725c625ae8eaf17c256fe1bfcce2243687c71f65eb5504853045be4486980cb00f
 DIST gentoo-kernel-5.10.117-1.ppc64le.xpak 55790781 BLAKE2B 6ca8b20f665b9d459524ac468fdde6f270d51c0148765d4adf194529323254e3813a9914bed797e6c4e33f110682f9a65bb3eb353dc391e4d8b23c49c71858a1 SHA512 db9e26a582bb14611b19aa867cfbbfe974df076107a11833e72a9c2c4ad6e3fe33c32d5b4d26c823a1ff4fe42382c5b4e0f139341b6d3fc030d048d8cdd39c8c
@@ -106,6 +108,10 @@ DIST gentoo-kernel-5.4.197-1.amd64.xpak 61551217 BLAKE2B bc167c2122c7782085bfbe0
 DIST gentoo-kernel-5.4.197-1.arm64.xpak 57767449 BLAKE2B e333dfff1a79d39adb243f3c3afb08429cbc6a2244272a56a402735dcc45cf7a7d64ff42320e7f4f4a9d1f4b1ba5a9ed449cd58f3ec76cad89aa584c85e3a037 SHA512 28dccdd59ae1fbb178df849565ff941fcb7624b5b6a051787aa73120cfde694f265e33a30cb0e60016d99e6a019d3f2484da86e642dbcc150ed1c65498cac787
 DIST gentoo-kernel-5.4.197-1.ppc64le.xpak 54931909 BLAKE2B 6785786d50f751d3de0109ac8bae4f198b64d2b9c77e635d857ab722df9e82e5091e273c7d641e13a76c3bcd11083d9dac70ee8b43be0a096a7b7d2bdddaaef4 SHA512 b0cf362ebda1491b2705c3d12603616199613e83a29ccf4c692515ae0db0a5063ffc24d35af9995be3c944a36004d7af0d50ff44cd2e0d6701cc68e311d52c3c
 DIST gentoo-kernel-5.4.197-1.x86.xpak 53263398 BLAKE2B 554818067d322396837b47041a8062b2fcab81c146a982c1f448f66653c9d133f3635764ebde21e343df49c700ad86aa8d57e01308c3e7d137b8fe3e763ea393 SHA512 765fb52135bc9a71d4f3c466607f8b5f8a98618aadc1242e1d0efd7658163cb2ccb6169fee8cfdd892b74306492e12305452e65ff9107259c6ba5ef980da7290
+DIST gentoo-kernel-5.4.198-1.amd64.xpak 61601794 BLAKE2B 3e9c48be77bf4343a57b94e7a71af111a89b9bb1138deb90855c62d8b0f97bb3fcef6a56d61a257e5ee2d54b0cd694cc3c39f385bbc840d3a933059eddacff91 SHA512 ecb345471a981aa91ecdc3b5fc3e25fb01bf19bef62fb146ce7f11d960e05f80477a14d4d51f1e122934d31705231e827e462f4dc65891c49bee77370d418b03
+DIST gentoo-kernel-5.4.198-1.arm64.xpak 57712035 BLAKE2B b77edc335a015b0b681021ef6305dc4b0e16b2bceb5a5e4b3aec459d70ea91990c771e7c3ee059f112a20aaa987630ca9aa15ea1d8570dd7490738d1833af7af SHA512 74889c4f1f62b6bc0f08be5a0b985535e88f4b933bf243441232c5cee297a20174a91a2b6aeda2275de5898b86c3831c91c42ed7987ffcfb488cc4c5ec670973
+DIST gentoo-kernel-5.4.198-1.ppc64le.xpak 55020080 BLAKE2B b98e4914565db67a55bd5b1e2ebcc2b3423e10c807bb0b09c7c43daebb5b9a8a29a08a6316e50cd78197644c3f4d0110f90fe6d6500bd67404aeb1bda538fae6 SHA512 0485d8b9d5f843e2efc5f10cf7f8991245fe4f9e529fcb4039da13581bab99681388330242414c3dfb2217075f420490b80d6ba49549187c960685bd72d47f25
+DIST gentoo-kernel-5.4.198-1.x86.xpak 53310006 BLAKE2B c591705391f0b209b0ace112d0f4d42b4eee81ad59e790f9cd9ec5f54f8c396c273d4c3dae192bbd79114f1938f4bba4cbd570216891bc8aa909ddf0c3ca033a SHA512 77da9b728272f522866f34791c66ddd170d29cffd71d6276f316f6febbedbb35a4c4ffd6990b9473ebf9eab645e887a1815ab54280dd70fb1ae050b87c4dc55b
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b

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