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

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

commit:     bf5f72880b71a8d5349119fb7a6b299ea1394281
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 19:37:44 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 20:05:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5f7288

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.124.ebuild               | 138 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1b1d27765b1d..8973a695890e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-132.base.tar.xz 6718336 BLAKE2B 3a1d86ff100ded252a1af8cb1cbe
 DIST genpatches-6.1-132.extras.tar.xz 4056 BLAKE2B 3f3d5e78761b9322a765bb8bdc137395e8382ffe7bd401f4b474530afd5f9ba570744058772978ac39c897f04eceb524ed53d32c8ed71fddd1a0191f31284c0f SHA512 ac96811e465540e96cfa443bf088bd9795c58080b19b87dcbf62c0a4c94dbbf28ee6d94262ca76bc38b9c591e4d07872294b14807e1d18ce804b69497cb0ee66
 DIST genpatches-6.1-133.base.tar.xz 6730928 BLAKE2B 0a3d788af308b602468d8bc26467d01f1ecc890b5da5fedd65b3eef33cf3da154b48e0ba71f1df6f77eac22ff355570f6096aea7bda695a2f7dad1f409387a9f SHA512 10ab1138a7a7ed000ef431d35af6375c1ad3ed8e3313b4ce43b19ecc4640fbfc8691a8113aba6bb3b3481fbe3077ee623d8f7c6c12337c809ee2f0d533adcecf
 DIST genpatches-6.1-133.extras.tar.xz 4056 BLAKE2B e5510780c454bbdd69f0d5d01bc6d792316f62a9e9217fe7500f688a5b8854b9d8406521e553808cf65e10f937be884fc4bbf3e3ce70f75b28a8254af03b77dc SHA512 e93284e4812b2a0a43e9de73c392874e1d48dfc3ad4d27a145fd43864e310cc60df3f509477570dca011dee7a9fb17ea2a72882e5316a50746a5a6cad58f373d
+DIST genpatches-6.1-134.base.tar.xz 6754804 BLAKE2B 36d49584071a74207d07d353e67b8c0e9f9d5ca3db44d5fc6c392bf34c022fd6ba9022734aba45fdd432673133e9f4f9ade495658550a68ad537153a08cd01af SHA512 214e8b20b52af4fb5b22035955dbafe665245c3ca85a1dab3419385be6f9f0d3b0f5d0ece9180c71a11c9e11b1c69153e82be282b46b41c1eba2df19226f90ea
+DIST genpatches-6.1-134.extras.tar.xz 4056 BLAKE2B 7612c02201b9db803c7b7c0b0c6e8c48dab78783e4d144eaf2e798fd0f1fe1e192138dea1802fa7a17385c6ca65ddf9b089cc3e547ca23efa36bda45cf355f5e SHA512 33e35c97ba7017e0b8c78f53aa4ab91e57c0a1f1fc246fec6ba6c3a091577bda2f99ecb1d909f3599d9123f2d99e756b7b6bb5b8086c8ff4cefc28a1827e5410
 DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B 1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633 SHA512 f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147
 DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B 9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54 SHA512 cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5
 DIST genpatches-6.12-11.base.tar.xz 711536 BLAKE2B a9911cbb7cca5e6f3b06adba52289957eaccbdef25aa1d1f610ac7d7fde2a1cce46095e3d48b281a9ff0a9e88559a492833f0f39cf151ba560d6f3ff8fa5a4b3 SHA512 d33a54716e726cc8d19b366a7ad1cc51822eba4fa329eda596e6e7dbd851a9725db4e5f4bb827f36a26604b7c0b5a60154a2310f99b18265fb3c68251420fc1c
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.1.123-1.amd64.gpkg.tar 73011200 BLAKE2B cba36288006a5da11c6
 DIST gentoo-kernel-6.1.123-1.arm64.gpkg.tar 65720320 BLAKE2B 3d0c4d421c2d9d062c99ed57a4f393834dcefe1144c5b5a68babba364f66d7c8eaf7b3c9eabee77ede08816fbe49c684b04bf8f55a2f7b2cf6f3ae0219cd81fb SHA512 a155758eac2b697e6069c5dc824e2b423eecd8b543bef02f1c781ace39c2394b81b976acb3bdf0642f5a8cb2dcf405d4fb54c3c9fe81ba476ffa9eb97bce7958
 DIST gentoo-kernel-6.1.123-1.ppc64le.gpkg.tar 59914240 BLAKE2B 4d9fbab35e1467c5f00fb4d60def4aaea8e67d96e8bb21efd183434ce48983848ebf4fdbccafeebb008487f3a1b64ddbf73d57b2f28666db3b8b2054f43b2201 SHA512 1e6a17ecc3419ac07922c19cdc7e42ef74a321249dec8b1f375bd1241476909e3231d62bfd66394a4e40870bf5ac5c03e96a80177b68752e9f11333e50e24704
 DIST gentoo-kernel-6.1.123-1.x86.gpkg.tar 62351360 BLAKE2B 447be977370406beda6def93a3e308e6ec3cccbdcd28aee42a531dabe933826b08ab65b3df6e58676a1b663c9369578b67c10fc7ef9904211be60afaf48b8580 SHA512 db74ed885d2e9fd07ea465e126753e8cc723f40b6dc2e71c4fcf7553a85c6c9188e2d28937bdb5804b11285130da6a7d3d9696db198ef934c9285ba5a12c79f2
+DIST gentoo-kernel-6.1.124-1.amd64.gpkg.tar 72990720 BLAKE2B 18ab1d61088387bec75437c006827d75008c528fa560525f54a6315acd4706ebab19610ecbf52e8886149a454f75980dc7b69d06a6cefbeed24440a284f4bca0 SHA512 a00709cc63dab5baf37d6aeb14f3fd026359cab00bf12cb9b249d068db1ee6a9791fdedc3730dd1bc4df0187cd84e1da6ce84b0cc9c9baa80c02b5a99191a9a1
+DIST gentoo-kernel-6.1.124-1.arm64.gpkg.tar 65720320 BLAKE2B 0f9eee72cda92c1f6e2c24ca0d428f4f01ae1d1d008abaa13b69caf030a7d134d6e251e5a1ec79e1564fc3ff6367aebd33a437c63964450e54d1f2dd49b4b3f2 SHA512 59680c53bf14af346e5445a13d4f6148694ad823f06f356dd16bf30fc72978910523943cde99c1240bc0ad7a8b16d46fcbbec450960800dcf25fb58e087fcac2
+DIST gentoo-kernel-6.1.124-1.ppc64le.gpkg.tar 59904000 BLAKE2B 942327648753a8418362448f1ed92964c3ac94816e580fb5f5d3380256e6f5b88e60d49deaa9f814bd55365bf5c6b72eac2b48fd72dbc4df7d93063f4ce1fd36 SHA512 0c93cb0a43b2c869f092ac067f099864e5b7811462100714619d78e014aeb98d4ff82fe118c6df914b2cc97103ccda7df61081690746a27e304721ec4c123b3c
+DIST gentoo-kernel-6.1.124-1.x86.gpkg.tar 62361600 BLAKE2B e2672c5ad61949c7ecfe535d2bf1a6ade3733932be7a5ea5e7eee37b3dae5c15bfb8ffa5018668e6f429c28809675ae37e59ce3f42e22e2bdf50fbe94a4999cc SHA512 5c4586c693bd3daed10c5a63b0841229a5631f54e488080d37cde4cff8971a830d9e058da32971e38fada0ca5c109555d6f62df1993e025ba02133774ad9498a
 DIST gentoo-kernel-6.12.7-1.amd64.gpkg.tar 298915840 BLAKE2B c4af62bc39de09dd063495bf6d5cca7efd8364b49b797bf90a89af4a049e255ebf3ad6406df4fdc1645e75eb4778f9cc4029b63c343b469b1129a33579c2f598 SHA512 7ae48ee72fbe878f408b753ad97b60cf0c46ee80f098835acfae5cefbb81a4c349945bcdbaa70df9962b8827732a244ee795d1e11d35e5b3d255532057bffde0
 DIST gentoo-kernel-6.12.7-1.arm64.gpkg.tar 272957440 BLAKE2B 0b912595630b087c7e1edfdb91798f2514d2b20869fe526f5e1b759ae6a02156050a435037ef58583049a41d9d392a7618f935d36d0bd11570bc588b5f9b6329 SHA512 0e420669ba619d67e65f6a477f36420fa924341819b31f047ae6d707c43b3f5c955c63faf37b48754dbf852e50c5049b19f0a5cf4e7bbbc4beb4895cf67d9e69
 DIST gentoo-kernel-6.12.7-1.ppc64le.gpkg.tar 73072640 BLAKE2B d9914726e39a58047931ff6ad75e79e6b1c5307a32da26e0d3a5b0235d94c15dd3489bd7b586eda0fc4c73512f8f429bdb700494dc5cc3675dd0b3ce4d51aec4 SHA512 a82245ba62d8779546e5c51f1900aaaabaf7f01fb0ff74f0c6a2754b56724c554268e82254ccd6ee87705dd32a076365075211e61afab38c278d017b3d57fab6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.124.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.124.ebuild
new file mode 100644
index 000000000000..dd88c26ac6f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.124.ebuild
@@ -0,0 +1,138 @@
+# Copyright 2020-2025 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##*.} + 10 ))
+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="
+	app-alternatives/bc
+	app-alternatives/lex
+	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 HOSTLD="$(tc-getBUILD_LD)"
+	if type -P "${HOSTLD}.bfd" &>/dev/null; then
+		HOSTLD+=.bfd
+	fi
+	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)"
+		HOSTLD="${HOSTLD}"
+		HOSTAR="$(tc-getBUILD_AR)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		READELF="$(tc-getREADELF)"
+
+		# 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() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+
+	# Overwrite the identifier in the prebuilt package
+	echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+	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
+}