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

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

commit:     e06001b3daeb79c1b48ad0931672580e5b847f48
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 02:53:19 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 02:54:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e06001b3

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 405fa92af76f..ec810022e9c1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573
 DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
 DIST genpatches-6.1-53.base.tar.xz 3225656 BLAKE2B d701a2920347788f343b14babfdd113b62b78218e8b19a5ee4f36d76b8571e697d9f3a3a9aa8364344e4d0ccaa60eccaab27b24036504b3ea1d011c4492a1eb2 SHA512 10aed454a5d7d7a763ec3008ceb17e30d989abcd76e1ca54d47b8946cf20a9de5991e09158a4e0b182ba58b41760a8de3bbd1979ff23fa9a84aa094c5c31094d
 DIST genpatches-6.1-53.extras.tar.xz 3812 BLAKE2B ad3b65af5b05947d20e1ecaaabd7304261310162c9ef679cba698712af55e7bc5b18ab1b69613a4442e38f362e34a9a1699408decd9016cfb4543c33ac97468a SHA512 a813b49a8af0cf17e48a88475731b6349dfa49af90e16037528eebd55a80b3ecdb52805547a56003a463b00a4302a779c8fff23970d73f3393cde7f205e92d32
+DIST genpatches-6.1-54.base.tar.xz 3229684 BLAKE2B 60e1d4729f621f5f9edd07d3cf4b61a6c14959379cedd634ec1cc492e8f68a9519ebc05b37978fb3c26c21525aac38ea455a5df98e39444fa8565e82e3d02869 SHA512 39e15559c44a613b73c012da1f7ee058de9b4ce04e30ebb98b308bb9252ebe36fde70888e0aa1879b6e13b1653029919ca8bffdb57b500181885e72aeef63c39
+DIST genpatches-6.1-54.extras.tar.xz 3812 BLAKE2B c8bd1937c8cfcfdcd0b8c52b947c694535e0375dcb31e8a7ec8426432ddb92a559e6e90b08b086552df6d822d2b26ee3afc6a8607bce820dc9741d169bf0579f SHA512 85f99d0e347036dd5e23dbe11ce1a0ccab042a9bd6980d8ba6cf9fe5e0504ca207e99084b09b011e77dc1d0455e818db87c171cc3857b3e8bc025ab0746c46b1
 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
@@ -32,6 +34,10 @@ DIST gentoo-kernel-6.1.47-1.amd64.gpkg.tar 76830720 BLAKE2B 913af5016feb6b2431b0
 DIST gentoo-kernel-6.1.47-1.arm64.gpkg.tar 69498880 BLAKE2B b607aaffb540ab776e11448ae623dc433366a39de99d64fc568b7b0905b4f329e7aea6f4bfd4b6cbc4334c2712b2d86126976692677e814a0ab4e9e39d87923b SHA512 02b11a64e78acec9cc01fdc41339cad40564eda161285cf924c4c3b7576cd07979992a8b7588134583c58b4e6ae24cc60ce37946b80056653579be93fcbca6e3
 DIST gentoo-kernel-6.1.47-1.ppc64le.gpkg.tar 62853120 BLAKE2B 139cc49ab4a51f75d3f4fe525e1d6b7174059775f754028710ef5c1614cca38ba70583cbe6e60f5bad80f20c085164474791855d49328c3eab90c7a94875ad40 SHA512 573c314515651b127e8ab74795dbfdd6e812b88849eb454e4e600c5bc30beb2102a17e4b89e369afe05e52cf7e11e7e6f8d597da49e75f2bb5a1b9213a9d9fd5
 DIST gentoo-kernel-6.1.47-1.x86.gpkg.tar 66242560 BLAKE2B 8be8dc33b458c51ee6adbab3e6679ad9c0b4547ef096d8cd12e0a7c0619eb1773e7b8ef16d2c3dd5de38886012ea1bd74d001e2c3af0a2618d1cae95fbd1c25c SHA512 88d556326f2634cf136a32f9b977783b85b99dc440cf3875cfb60d7b070d4cca5f75e2c60496805979333df8db9d74e2ba01683007427375eff4464b5c942259
+DIST gentoo-kernel-6.1.48-1.amd64.gpkg.tar 72499200 BLAKE2B 875adc196d87d20f976830c07952e3869ace428f207d1917f87fb420f308ae317b4306d25b963e8b4534e58a1e96a000dd2386826c07568c70b6ad3eabfa9f62 SHA512 3690588ae0e6655cb3e2170e0440d1b8f62b6a1a20c639ed03591171f5ab8cd755c9b2d57b10193517d55516881b97dfc159d0a8abae2871801c7376d2b385a4
+DIST gentoo-kernel-6.1.48-1.arm64.gpkg.tar 65198080 BLAKE2B c3a24e5eae97225a897efdd28a022a55bdeef27288cf52fd32625efad095f357ac8150082d2f2f82fc206782cdbfeb1599bfb7f803b510e0479f233b95d10e47 SHA512 ffc23f992072bf31a7af6dffff15dd0135a12d5c1c487523c7ef79ec4e0b185933bc1a24a8939b5b274de60695c7a77032535a528494e56d7258fafef0eaca27
+DIST gentoo-kernel-6.1.48-1.ppc64le.gpkg.tar 59832320 BLAKE2B fbeb43928f2084c3965fc9d4ba4a6be5839b875090cec865b92a37899f6d0c720f9abb9c4faab7fb6021bb74b8b2ffde7a8ade8ca8edb6f6d3c622a96a6e174a SHA512 17c1e8d8470304772f206f8fdfa63ae7d7d4be727e8f5cfa6a5eccceac30c2bcc8d593998325d3241bc95edcecc2c55c389984801b82fe1f2b9061bb5db2bf6c
+DIST gentoo-kernel-6.1.48-1.x86.gpkg.tar 61972480 BLAKE2B ed71d3cc660d288218264b44f629d21308ff2fca8fa0e0d10c6cb8fc8b55a466852173b7a0ad1d6577fc93edb588c630e05833f00e26e96bf4b5466d1d6c3c3d SHA512 9e179d7042d67b58c6daa58b1f1375d1770117ec62662d5a5d125beb4fd4eb6bc493afda390e8fe56006611bac2b4d14c7d400e31b1f47015ce1f5f3ccbb72f0
 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.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.48.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.48.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
+}