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

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

commit:     5f641a30a745b2eed83fe0d03ca775fdb9267989
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 13:36:39 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 13:37:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f641a30

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.242.ebuild               | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index fad17da77be4..4a4f5c43ca7d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-5.4-246.base.tar.xz 5659072 BLAKE2B 4b3f836c7e9f7f4d1cac0c735bbb
 DIST genpatches-5.4-246.extras.tar.xz 1812 BLAKE2B 78297c82519cf71230dc19d674d345cb40d8226adab6af53c0c3af7239f7a1464b8c89b51b62c509b33e8b2eb1a8c102b10146a8a6151ab5f069a1e00f8f6f8c SHA512 13aa1321f559e01257926ef94dd023222c2be9225bb412424a4b4696c1e6d6abe3e7f29c375836e1f9986d496df89051a60c34e8f8070aa0bd556683a387e356
 DIST genpatches-5.4-247.base.tar.xz 5681456 BLAKE2B cafe9c11c4f1c5beceea2f8dbee2cbe9823c562a485242234a6606353fb237cef9508e8dc184f6c054ce1699b24af072c2e7952a406f776a566c40914d9ee434 SHA512 2db25e42bf227a836d9b378e8190b17f2075f3453a5492226eef031d2166bfc85859406fde6fea357ff05f6496bed28749355b5a66314f86b5abbb2dbcfbaf4a
 DIST genpatches-5.4-247.extras.tar.xz 1812 BLAKE2B d41b63d5aded3792a6c5fd922aafef3e4e7bbbf6f86ae7039271643010c221c404177406f3ee2071429df33abc8ceefd6d496a8d0d538cf5101d0e76161c36bc SHA512 e896b713dc8fe0094f97cd6191da51aafef454e0126e8f7ca00f866ba87074cf4d41830fbc6637b8ee7189a5dc529b32fc870d2c53c820a03db95675c9f2b340
+DIST genpatches-5.4-248.base.tar.xz 5689960 BLAKE2B 50714236c3fa565fb097577d8885ea6b0f6448061025221c317df2270877f70093446a79c60baa8247a80a481ee2475720836651cf2a83c31b13e0a59e6e30ed SHA512 0850c79fe4bbb6752e2a9a316204638287107b72ed180d0f417b6d03fd9288305a221d1e085bc4da0fe7ed82790e29525bee72c288f5e6d876c306ef316f8d82
+DIST genpatches-5.4-248.extras.tar.xz 1812 BLAKE2B 2e95caa558cb93ee161cb9c83f7a5b403539253c1c74f4b3f1d7433b96c5100504d132bde1d2f1d4d790061720c29fc4c77cafcf0cb4ca80ee8a8826db076670 SHA512 194f2797181812b13e25755bb9413821790d953029e322ca5e24c534df56a0fe094ec005e50a761d3968f68d5c9502b27a47c87fc3276472db900f856708abe4
 DIST genpatches-6.1-26.base.tar.xz 1261204 BLAKE2B c8e9b6f12aa7611fbef190dbe5eed519ba31db4f3a4a59171cd3b896dea5dde47acaced603aaf71fda200cdbc6d068943a58ca2b90c259445a39fdbedd19b8ba SHA512 648a85fe97e4d9754796cddc432611cbe62ca34747f86e088c541fcda75590445dfb4edffbff5d8358b7822c0bd60fcbe48a96a5c1aa9e0d5e168664e80ad8a5
 DIST genpatches-6.1-26.extras.tar.xz 3808 BLAKE2B 061dc90cf89ea3876aee7cf9533f33538134e186c6e7daa6dc45ca0efc671822d9b3c3b8868b54978800da24cd550e5433ef866bdaeeaaf326fc765c66a69f7b SHA512 fbd23f38483227af5149cec04cbc70d76f962a15517e85782d0d15e4f55be4d4946ce774a8eaf697483b5c1e047ae83a29988202d782ae9038b6d946d23515fc
 DIST genpatches-6.1-27.base.tar.xz 1321772 BLAKE2B 8d46e2a7c0023fdca7f30edf56f1504235dfb9f175393dbc4494f58c9fcb4402f0e744bf8f855baf66f3e71531efbf1ed9b2aac7a0143292c336efeaef665eda SHA512 4fc05627f050986dcae332bfae4c582d308f195393ae8cf00c1f32a73a42be0c7178eb5b7e0a4fdd996b203702535523e33b65972540b3a97da3dc1662c49f36
@@ -84,6 +86,10 @@ DIST gentoo-kernel-5.4.241-1.amd64.gpkg.tar 60497920 BLAKE2B 608cc239fd7ccf1d5dd
 DIST gentoo-kernel-5.4.241-1.arm64.gpkg.tar 56514560 BLAKE2B 121fd2039333530cfe47b81d59da3aa5b2a319bf8f365ed7695bf85e2cc3e480a7e2f335097833b087a4a14ed31e220e09afc74917427023bb82240b474d4340 SHA512 e45b27ee4c6e29d499a75d5fb227c969043abc85e3a82adee03c896f8a742146779c91bceae2f278fd039f409126314d5e26a52b1478b468dc1749fd3b61c3e1
 DIST gentoo-kernel-5.4.241-1.ppc64le.gpkg.tar 54200320 BLAKE2B 746c69118b55e0fd9bd9660c2628720d77e06b62f878559b2355e2978fb8674c095293e63938d4b4c520f05d544600a75d4bb6e7fe6f2df2fedc54a71e9d33b7 SHA512 417b35c7f8a4a106f81a5dd3d0ae66df8f92c4a8838ccc9cf63d700913d50ae75bb3fd1be9699a40061294b82eaeb921619749542dbbb63d825ac3f548dba61c
 DIST gentoo-kernel-5.4.241-1.x86.gpkg.tar 52480000 BLAKE2B aa5d8b6235fbe853045ca3d6d1a8e5a1ae1a74bad52fe504a783f99525200af5c0f20c2ec754b2a54ff3ffae0e3364e78e5b6053e1299dbb35301163fd8cdd46 SHA512 44633a1665242d7d7ddba3bc69e640e16553fe4f89864147d3f8ed275e90fee0835f2eef5b985fcbce7656dab511c1b4197897b31417205f1779061120769c66
+DIST gentoo-kernel-5.4.242-1.amd64.gpkg.tar 60538880 BLAKE2B add29fe313609cde547e9112f82329cb95bfdc011f372ee30acb904533f75fee9c85725b3cd10bf80f04bd6ea4546c9ebb2005cf20897fc6c6ea7ab21f2ffa4c SHA512 ac32cbfe2c4b81d732aaeea0a48db70e4eb1aa82aee2fb0a0d1a4cd953c4bbe1fed98ce1829904e641076470ec5b4c51feff582f979b49daac2d747272be8148
+DIST gentoo-kernel-5.4.242-1.arm64.gpkg.tar 56524800 BLAKE2B 611eb07e3b0d5bd98e2bf88114582f1f554d402d8040ad5c57e98ef59f4cd89a8d83f288c36e08213e511a40b9b7f643d6036c916954a3827ff4c394d86418ca SHA512 7a0aa6689920c6800716f5f857697a043eda7d4f7f40c5434e244ff3fe8bf32f0587cc358fca16e666de10129f538b73c02567c3fb52db6a9ca4e38c5dda50f2
+DIST gentoo-kernel-5.4.242-1.ppc64le.gpkg.tar 54200320 BLAKE2B 0dacbf50f30b63b796da5d6a29377e7693d805fca0a51514f54b16dd55bfd5318f15dec0be7ac4ec68e4690cd75f533d97cbc2eb8619fd2fa7d0f8012e036a34 SHA512 6fb3d528a25e31f552f0693110d3d25b17fa85ffabaa4fa04314a45baf2c20a61ffc7e105822aa03c8ba6d8679ec3f5e1fc7485d77752e015e497e32eccaa223
+DIST gentoo-kernel-5.4.242-1.x86.gpkg.tar 52459520 BLAKE2B 5d4f1fe9e5c9d931f73a7e9508dd68612320a055929db5211182467e5dbe5e23fa9919c473b982b83f2dc9a9f47660476b689057205592bf05df1c1ed29bfc60 SHA512 d594ebb2b6bece007679d3c9a1dbd3138b3985bf8eaa3b3115c610f30016931493c63d5c256a5dfee9be861ee37608d5a9e2b37bc8f770d1558bd13ea6fdbfdd
 DIST gentoo-kernel-6.1.22-1.amd64.gpkg.tar 76646400 BLAKE2B 2040d4241a9492c8c58664fb9db62e5aca2d1876a0902596584b26b8fcb417118a8be48b2958e71fed07cc16ba99bebde1e31bdf4ddaf63f9b139fc4af6e3c5b SHA512 97d6e764a95a5e5496b73c79cec32cd2ba28b20e626d017727b8d09a827089ed749df5169c85b2ab23bdccf5be1622fff1856d1acf1dfc9b7ace5888f78aed8b
 DIST gentoo-kernel-6.1.22-1.arm64.gpkg.tar 69273600 BLAKE2B 776cff9335239ef9d404f0aa0a99719df5ec57354acafb91f611b51c2ece31cdfd1ba17542eb3e669fa7876901ee42716f75e1f61296f00cff9e7c3764903f17 SHA512 d1bab7cc31b7157da02d5c8fb79e22971e88126e083163177baf7a5e40fb75f601e7290e88fbeea0215d953785f94a4138a379aa9e4cc67ed340d063b1ac0f8c
 DIST gentoo-kernel-6.1.22-1.ppc64le.gpkg.tar 62699520 BLAKE2B 524c2e5d5b6c7aa83323f8e9a0c69a7fbbbfe1ce29cecee64ba9d05f46bf6a6e75aff0fa8d0ac13b62cd2f7c588ba6a64aaaca882a3785f241c96bdf2ad2203a SHA512 c9db157e2f0f62a848cbb05bf2b2ccc8b643e73ed3c5f623cd2533124b198a8bdf05eb4dd9cd3b959df9cdfd6d11ddb7a4f9a1b7c1618265869fb9bf061bd29a

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.242.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.242.ebuild
new file mode 100644
index 000000000000..7e040c8ce69b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.242.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+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}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+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
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/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
+}