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

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

commit:     31796762a71c6802aab4ae8e47d7be442b183fa8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 18:10:55 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 18:20:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31796762

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3f9eb6b93269..342f17bc6df1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-54.base.tar.xz 3229684 BLAKE2B 60e1d4729f621f5f9edd07d3cf4b6
 DIST genpatches-6.1-54.extras.tar.xz 3812 BLAKE2B c8bd1937c8cfcfdcd0b8c52b947c694535e0375dcb31e8a7ec8426432ddb92a559e6e90b08b086552df6d822d2b26ee3afc6a8607bce820dc9741d169bf0579f SHA512 85f99d0e347036dd5e23dbe11ce1a0ccab042a9bd6980d8ba6cf9fe5e0504ca207e99084b09b011e77dc1d0455e818db87c171cc3857b3e8bc025ab0746c46b1
 DIST genpatches-6.1-55.base.tar.xz 3230904 BLAKE2B eaf52b27c1fbe9d25a27b18bc6eb9462d563c0c9c38ed4cae24a8f10cfbdda92c830523a5cd49aab16959ff860d5b10772f5a58eab10cd0796faae17baf4fdee SHA512 37c236a79fad31a9411ab28661f134f697f6f38242f12f5b06e45a80a101e1e2ec50bb77a3fd35aecf0339dd8df82d5b84b1f542316e1b73bd1d2c796275c6bc
 DIST genpatches-6.1-55.extras.tar.xz 3808 BLAKE2B de074120fec5b94a8378313fd1c14166ea156008d679e53fe114d2a477ddc8f83e2b64ead63a7b43fcfcf4f168225b8ec2de7383b8749c661b493139560e35c1 SHA512 88d6c13ff77590b1240e7958cefa8fb1f738df2b56aaa2ef2e8b63ee4d67ccf87c3da3a9fb6d781009d9c9a8db4907418a9af2f634d92d858fab4f33afb745c1
+DIST genpatches-6.1-56.base.tar.xz 3326400 BLAKE2B 4a62be88a16883b13ab169a93933a638aa61ca469fdab5f4a474a68983dfdca256bdbc4e62bf7b4ccbed48365a966c6396588444d45ed210a3dfefc8677a3ca5 SHA512 5c9d46528036cd7457e825dd97d7c20c69cee3f6d0279b82b0f45a3ec707d15a74afd270a0084e3438948a47c3128cca4ce2c53d45590c0260dd3b4324206287
+DIST genpatches-6.1-56.extras.tar.xz 3808 BLAKE2B 647f53e02a9a383d96beec781f33892f015302609b93f6d9f8408ad1e8b2ffb423d01f0f540365fdcb795e493bc1bc493c390a218226258f6ac51e8fc8bad657 SHA512 c4bf617db17818a615b279a2351e5f369c9efb256b30e2581210c57758ca519eff1d8a320bbceefc5ac8784e530476dd2db7cc559e7da99c3d1037d1ce69e663
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
 DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.1.49-1.amd64.gpkg.tar 72478720 BLAKE2B 723c67664e642493952c
 DIST gentoo-kernel-6.1.49-1.arm64.gpkg.tar 65208320 BLAKE2B ebc6f5eb92a2753ede2909b1a842625612505ce2efa864d9a32710464b59524a282e40d9d370652c896c7ca6a58ad444b34c13afd159c606619e58b290122437 SHA512 45ef052acbeb66f1bfb065c5e17ec02067fc2f9d0af9808b4ca630449ca8abcae45bcdb65bd955de2fc7db4a7f553789c321bde879b905ac2ab2fe01a9bd58fd
 DIST gentoo-kernel-6.1.49-1.ppc64le.gpkg.tar 59801600 BLAKE2B fb2edae696106228c19035d93dad637cfbf72f88c1b503a8ef59b3822f13adf3c99dc865de06dab31744534df10e16436d8a20738879734359e0e8667c54bd77 SHA512 2d3e7a5baa78ab0e7f6c9dc5397b2401b39da1be4e32e33301ef154bfda80ed346d2576381cb744d8be568e512834ffeaa2668a3f81d80590b48898a5df73daf
 DIST gentoo-kernel-6.1.49-1.x86.gpkg.tar 61962240 BLAKE2B dc2007f7b40d9ccfec1d65daaa1433624852277db763ca3d8a403f03108c1ac3511898443329e014fd9feabe35417a291d2b68a5aac77ffc3c6cb7693aeb76d6 SHA512 2e8e2b9f2d4aace921e808e3222fa9782a1ad354d9ed2401e4c976fabea549b75f19d8adbe70088c56219949b777e4ce9de47d8fc9bbf4ad9083a0c7aeea27ec
+DIST gentoo-kernel-6.1.50-1.amd64.gpkg.tar 72519680 BLAKE2B 87aa1ff52c7afb64b0d70b5a810985deabfab2bc9719682f007f6be5ea9d65f7440f1a16ace558f11cbdcc2a244b2e4816534d7dda2258db63a49c3d55f35840 SHA512 c3efa7746728c7fd4fac378aa249ac2fe16bac2f3dd8408d9a480c808227b832b8d0e38606a091817bb7616766c063070c29a838baae8bd3853fd6949359e92f
+DIST gentoo-kernel-6.1.50-1.arm64.gpkg.tar 65187840 BLAKE2B b565c6dce83397a1aff54b9a2804b22eafa66a2630d1c6a14d7b95e55992cd96004af61bf4fef2e1c0f89c45ab9a2b70f14b65f32e8172644852ca59cc3eec0c SHA512 05062f8b1421a905f1167750b22078eca21e0d5c1ec8d1c1f5b70d219b22b8f87d7b679ddffcbcbcf539f5d6b792cbf1c00b1ac24a53549a79f152ac302b8caa
+DIST gentoo-kernel-6.1.50-1.ppc64le.gpkg.tar 59811840 BLAKE2B 6fb21e8f96a25be68e544a3a0f595bc3906de96b1cd531f1787cbf26805554418afbeaad2aa642464d9e90c4d55a651a9f8a4f86244777bba208ef3a5a6f246a SHA512 48d24bfc91bf62ab07ea1b077aff4ba32f43338dc064038416c9c36b4e024df68c44dbeb404b993b0910954c48282360ac70cb3fdcd385cae21812d35c2b3681
+DIST gentoo-kernel-6.1.50-1.x86.gpkg.tar 61962240 BLAKE2B 37ea93186d8284b8937a545cf263af63e6414baea3562a7d18cdc7a26703aed9be5a2fc803f33d6938abfbd58ec41a41850c4d2cc29e377538755a1abb192143 SHA512 c2dba3727a0a8cd69f6d55dca4f0538d28622ec2c105ff3ea0c4460d9605aec1ff4cb1b4be2f6a69ff9241793d48fcd08fa56b742b5f1a84c805e6000302254b
 DIST gentoo-kernel-6.4.11-1.amd64.gpkg.tar 84060160 BLAKE2B 53cb5140f149d9efe604a5ec1a631557b66a0d970fb4b44c20e602f0a430e1c57f29d3f532e56b249583e0cdedd05eefeb788f5773a7ec8a55761f5975b70625 SHA512 9eae8e36cd2eca63c6fe0133c34be5a2f13c006caae596e75a4e97ab7d0a31553f625b31e3a307402ad1971ab0d8407b6684908b4ea54d9ae096c59745e745c5
 DIST gentoo-kernel-6.4.11-1.arm64.gpkg.tar 72960000 BLAKE2B f023f2cf059ebe741840a79ff03f5c869f33b143bba229b1499e8edc02aa4e5b28707eb8f21979302da0a747f75db5c8dfb0d545f0fccc081dd64ee5d53924c0 SHA512 dc5e9d29e270be21adf2dd27f687d3a43fe0a9ed56e81c6fda2a4d05582935827e814f869b14581692fb46127e0e201f779eedd0757cba2b5fca31be51a1b64c
 DIST gentoo-kernel-6.4.11-1.ppc64le.gpkg.tar 64655360 BLAKE2B 16702f5aef82f29e76e7ff583903e63c96defdc30efca67f5c629904c7cb3febc39c1bdda16764c4a0c12a60eca97415cff9efe0845b95f6a2ee54f4170563b2 SHA512 9954161681fb69761e5c36db2d357cd73712f8af2f9dd31cc6437bece50e94567976f5d703d3e59c19fcdb82a85e65424a7fa4a67c10d7aa1f1ccd89ce002c97

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.50.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.50.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.50.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=${PF/-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
+}