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

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

commit:     a1b3f306d1fa0e113628fc568a082330feaf1ac1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 13:41:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 13:41:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b3f306

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 725db3e74a9e..22089f8d8f7f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.1-56.base.tar.xz 3326400 BLAKE2B 4a62be88a16883b13ab169a93933a
 DIST genpatches-6.1-56.extras.tar.xz 3808 BLAKE2B 647f53e02a9a383d96beec781f33892f015302609b93f6d9f8408ad1e8b2ffb423d01f0f540365fdcb795e493bc1bc493c390a218226258f6ac51e8fc8bad657 SHA512 c4bf617db17818a615b279a2351e5f369c9efb256b30e2581210c57758ca519eff1d8a320bbceefc5ac8784e530476dd2db7cc559e7da99c3d1037d1ce69e663
 DIST genpatches-6.1-57.base.tar.xz 3329956 BLAKE2B d43450b8139d3a37aa248d8b5af3047d29cc8a16346512633d6ebd55c8adfda8a165d707051e4bf5b167830a711074e9fa4fd2038c04505ee455a6a43686eb1a SHA512 1917b2d9026372ced986e2572f9b1f99633bd61154855547283110279d3feca3fe2326d200bda75c61a617ff61a5758032bddbb4fc37dc403384bb76e060bcb3
 DIST genpatches-6.1-57.extras.tar.xz 3808 BLAKE2B 39e1e8aef7db1d76f770bdee410c6b26bc7bab3e6c7b3e7ef342122d83ac8fea8bf1975887bef6ba1be2e99035f2f233ff3267c05a1e6d17ccf282ee26c4eba2 SHA512 027cf468cd29d927f620f013c2d1461dbe4877f587d8e4fcd02dde085bbdbb4f0f1ffb5cd23a84ba89ce9a5425144eb28a72415b2998bad14ea8a589316f32c5
+DIST genpatches-6.1-58.base.tar.xz 3336552 BLAKE2B bea24fa334dd00948056ec5c1e18b20869347e33a1a61cbcdbc03d821c3da697689a84c8cc09d4127b94c9c581d4293c1d847c692522bb4a37fcf4850272d1ed SHA512 69c21b4ee470a49bc5b82c3fe8ee53d688585d1b30cda72dc2e7aac230b65d5972e4d7ad4b879f32012412a7c59e0573772d1ee217c5d2e5cb9790759f7ecd82
+DIST genpatches-6.1-58.extras.tar.xz 3812 BLAKE2B 16953223f8d699527c36c16c45e20be26ed8afe6ebb6eb2badb8f2f303f6d22d1ea351b6c16c0b14110580275c50b074560d4e2b79851850c20ffe6e279b8287 SHA512 23ac18840460888f60b1f35f2625c9e4cefb31a61d9a8449ff890cf29c7f9ad61416da95d198e197bb6cd30dedeeb20466284bab7f5fd7a8f103c5a1b055ed31
 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
@@ -104,6 +106,10 @@ DIST gentoo-kernel-6.1.51-1.amd64.gpkg.tar 72488960 BLAKE2B 7af239f4360f79e07bdb
 DIST gentoo-kernel-6.1.51-1.arm64.gpkg.tar 65187840 BLAKE2B 5edb676a59d946af4eb86e45d930d761dc4344f0df64d502b60e74869bd4165de75c016d2604b6889d9e1e2e6f5aebc4a51c810f9ed9757b1226890801cd79a3 SHA512 53adda1003ec3abaf44f2cc451d783510bd54053f2ee6df69fd25e8d60cd3b49145894067b94117f200079cb90358e7517ca9437478311c8edd1db4d03751cfd
 DIST gentoo-kernel-6.1.51-1.ppc64le.gpkg.tar 59822080 BLAKE2B cb18a79d7f5bf8adbc98973468d01b7cb03f8036c1992d4b9f6d7609ca533bb5c90a3e40fd8afc011e68d28bdf61bb882f664f9e796d4e74f22ca26656c7558d SHA512 c45b9eda0fa906e1df558564e6e963e053ac307bbb7dbf4d7a19f3a632f721543f93ba18329c0e0058d10e3de6239aaf6578bae456932a62047496a8f6e61f0b
 DIST gentoo-kernel-6.1.51-1.x86.gpkg.tar 61941760 BLAKE2B f063a0bf783c4eb4cf0d018f269dfce5d819eec47eb3f856c8c63b2aef7a623d0c33d1c6508dab5ecd4df6a7f1f14e4c96320965000a14acfb32ac4999a640e8 SHA512 f18116bdb363ef2264e01ec687120b35a59b21e00e8149436f69155278cdceaf9bb8f3a97811959b3878bc444f2550d67c84faf1db0e7abdae84815fcd3c1ceb
+DIST gentoo-kernel-6.1.52-1.amd64.gpkg.tar 72499200 BLAKE2B 5a036d4891d6b059fc620cee9439cc0b9c1dce612461ff9201ba5abccbec574240cf4563443b90601b2a3eb2a4af1f0cac85a947a8a2e2380bd7f8619370f1d7 SHA512 f3bf192f802dc8b494315a71eeb30d3346aaf5458166befec7359cb6a247bbba0000f0429cca628dab531be168b5c26d4074646f151eb5e4c48cf6dc0680ceb8
+DIST gentoo-kernel-6.1.52-1.arm64.gpkg.tar 65198080 BLAKE2B 197fe966ba8528abd5d786f893ad7751561221a414214eb302011633bb251994767eec64b3eabaa8cb242dd6f4b4cc6e46d70a82adcbdb1dc6bfd57744a24d50 SHA512 280fd5611f11ea43c9c4399afe2c7841992f463714a3333529274c91b19cd147e6d5f41a8a3d6173010889e17747476a39f33142c56d60f959ba2375be929a1f
+DIST gentoo-kernel-6.1.52-1.ppc64le.gpkg.tar 59822080 BLAKE2B f7df1d4defcaa67f1db04c89e48129f410cf8ae9efd79a1f05b2551faa2b985cc1518e4b9c6c21d5026d8b61ecec65cddc8a1abe79d436c5afe89e3fb030dde0 SHA512 f40be07c14be12c0cc65a3c42deadb30c4a7a61376ddbbed53386019304e778b3bbf873d3a654843dfa4a7a126d1e41d28d0db6d964b74aa387c6df8e2c21a30
+DIST gentoo-kernel-6.1.52-1.x86.gpkg.tar 61972480 BLAKE2B 1d1a1e213cf777dde3f20033937b3fb237d0003a300da980ad18ce37f34d395b02a2d609936ea2722e8e3691fb2acc69d58bf534df52a73507146bc2bd0c124d SHA512 5b4c515d6d32973f5d2f62061f047f25cce7db66affff8303fc67fb2e6240720b392faa615ac7be32c242cf7cf8ec6be9ed8bf9be1e905160fc6453592261f01
 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.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.52.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.52.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
+}