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

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

2 files changed, 138 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9be2f17f97dd..b0e2bc21bdb3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-103.base.tar.xz 5388276 BLAKE2B 65937527b152c928f416a22f8dd1
 DIST genpatches-6.1-103.extras.tar.xz 4044 BLAKE2B 72b5b73ab28b4b138cbc00cd04a2ea28763b1e95b8fda754c15fb8de5c23f091d536152f71811f165117bb670962b94ee22ef236282cb3f8a47157ee316366c5 SHA512 6cac58d98e3e6590b708b1a506e9e6a7b3bce9a83dd0915f95468e657e066f68d778c8953a574a3e8e9b175f6605b7f982e0235af99437059d282fb26d79a1f9
 DIST genpatches-6.1-104.base.tar.xz 5452728 BLAKE2B 49a8765789436c1bdb34f72e865232942b3b7e2bf4f3c2b4cded7786677f3235982e020aad0ab364a2bac0393dc28837f904fe5bee5a4cea12ec11dbf6ec642c SHA512 cb33672fc2d88e740ee025d9f8d8725fa398132e7bd940a831f60d2de3fdf13e4cb96e39f2707deec9bc5471789706e43501c9eb6044dab78dc34a71f9af60ce
 DIST genpatches-6.1-104.extras.tar.xz 4048 BLAKE2B 526ac16b6ffd987dd4f87797eeaa4ab1d25a8f27fb5b924f13651330abaa2a29bcc4d7d56d5be63b6d8f1c25c8f3205fd51ddbef1b324de89f67731271b24283 SHA512 3fe90150711eec1c4277e6b4cee2599e97edf0902ec7efae1ad836ccfe62233e2c6944f7abc30042e7dd5985ba1f8a986bc3de086739f5a8b64d18c2d7025742
+DIST genpatches-6.1-105.base.tar.xz 5482556 BLAKE2B 65a6acbab40206722368b4953749ad24c826cf8792271853092c3dc111197ff13efff6beb25487a3b3c136e564f400b6ae2a0c43826ac1173a0275fa5792e1f5 SHA512 f9ad78ab70feb8ce409d0fd86de797adfe8fd95c794deb388d87664f7f3754daf83590637059904ec4cc06d972d668efbad4ff91a9e86b4fdf04fbfd2c34f438
+DIST genpatches-6.1-105.extras.tar.xz 4048 BLAKE2B b5be2421ceb2e112fbc1cdbecc96656653192f37648d643832d9accb08102bb55bbd44051ba941a2fa45de9d73659bad5b328904c4367ca808716f7b6ddc274d SHA512 ca050960b5c56bdc5dc0dcd0d0258293b693b893f38964d0a1ea5ad291a07c410025f162596e7b26935c20a6b151ee387635152f34cde3e8a2109c890181209c
 DIST genpatches-6.6-39.base.tar.xz 2117476 BLAKE2B ffc2263d43bf5e87e3a57c0370f1cd1ecfac87ddaaee1ed3213f36bedbe4441ecfb062abebd1312572971e9cc9e5a0e8d3e16c7af98862b087906d61fb4e1e10 SHA512 6db496702e671459f3b054ce7068bfa48fc3b2be6bd3cbc3b158f7d4e0a2fa2310b875e46d233adea870775358e6e9b4f19fe8940d146575df9a41bfafeb1ded
 DIST genpatches-6.6-39.extras.tar.xz 4048 BLAKE2B ee5b09ec6303feb32fcd38a500900d6c96922a7a4032bea83202d25f914f2bb55d8e2e8e8d3b34911d0cc6755dde1e4382365f7351ccffe9901a0f6f671554c1 SHA512 d73671c60a9b57de492432eac1eac98178e1e3cd6fc2b68f4aaa24e6dc0fa4345a91633bd400f78a982e288033c69e0d28abbffc90ac2bdddb3430d2ab3bae91
 DIST genpatches-6.6-40.base.tar.xz 2364536 BLAKE2B 53bf04c020921c8d0c2e7ff8466db4cf5078ac8985e95b5b94c5fe9e824747d66344acd5d8675c42364704dc34268cd636fe10bcb02b657cac889ea8d0b4ae48 SHA512 c5852fc2db474fcf697818cec947cfcce0dcff834c57c042c42321889839d94c26d1994dfc275e64e0acba3055c90f0f0cc4e2a07c80a71a71f3ba99f6093401
@@ -70,6 +72,10 @@ DIST gentoo-kernel-6.1.95-1.amd64.gpkg.tar 72560640 BLAKE2B 67e26e89e23205c77aca
 DIST gentoo-kernel-6.1.95-1.arm64.gpkg.tar 65536000 BLAKE2B f6aefc6963310a5d40b9efc3eb8cb05cec28a285113f1bff26149ad4454aa86636c82f59c6cb2937aed1118c8e8407d1477d9ba471dbe49df9bbb884f395e79a SHA512 545b705a6068606db1c8bf1d31cc4ca80e8b522a2ebf121f414a519145bc97e94af1b340bc8a3a9b527137e2e55a058fc572cb2005836b27ce32573eb3243339
 DIST gentoo-kernel-6.1.95-1.ppc64le.gpkg.tar 59791360 BLAKE2B d21ec9b8e44b7291e17b6766afea3cde882470ce89e6ab4565d967614750b2b55ea2c1bb5752aa42d8b66e361a9b1ebb4a91392cfc614b0764589409c3d35f19 SHA512 18a172b9c817a45b425fbb037b8128445ef3e08ba49e82f04a212962a8f0f491c4a3923c6f45d810c407d8171dff2a19e409320130cec1a9805fb837fd66d143
 DIST gentoo-kernel-6.1.95-1.x86.gpkg.tar 62126080 BLAKE2B 4ef53758488d76af2b19514e5ca230252626e294c8d46c052b67ab0c9e8d7ce3fb94cac48c47f6834bd7598790de5bb7740aba48b1c6123b7f9384d2dde41c68 SHA512 5197ecac6afd9ab8e14e5ae4e7939c9ab3c609df5845ce921f38ec11902348c2e020823fab9e5c57c5babf01c890ff4d22363d7def75d7279cdc6b0dc88226a1
+DIST gentoo-kernel-6.1.96-1.amd64.gpkg.tar 72581120 BLAKE2B 2ae75cac2d5ef149a8dbc5ee3bcf074ce5deb81c3a55e83c2d2b88f647894069f52cde74438c41ee8f8e21eca42cbd0847814824cf2007e6cf1548567ce62692 SHA512 86cad8fbc3f664bc1c25b15f75cae3d42a40b4c603121d6a7402e814d3072adba0f8cd70494d56b2648fa50015ea2c3d8c38d1ba9b419856fd4df5744b5e5b95
+DIST gentoo-kernel-6.1.96-1.arm64.gpkg.tar 65525760 BLAKE2B e4537c337a27dfaa54b07c35305a5d2fd4fd1a9bd79dfba60ef189c4cbf467667d190acf1a89eb14b28f7ee9700a900be5606db5963cff2ee8f35914512d67c5 SHA512 969b7f89e80a6d12f65a9deb5f290592f99b883b7bb47cafa11130780e35a985f6249161714b55a0c1e462d2b162858c854f2ccc2a8fa34e702b16e69cfdc70b
+DIST gentoo-kernel-6.1.96-1.ppc64le.gpkg.tar 59781120 BLAKE2B 5bf52475dbd05533294c056b5ca79fbeb06fe46003f90d3b45e459d4e33d7a424ce0cc87cae973c68e43b0de599ad8454b7701737b05dac21e7af20d8766f92f SHA512 2fe07dc528ba090c59e5e8fed384850bf4e7c03d2f3982a8c1055e93c141ad26cbcfc801b90cbea9e648ae961d3227561318fc7fab223ee7e4b427c904a4d8c4
+DIST gentoo-kernel-6.1.96-1.x86.gpkg.tar 62126080 BLAKE2B c613f5afec99730a56acd99330d64a3277571cb30830f311709585d7d37cc08950adab324f50edad99b34bb195f561425852d6da58fc33a9efbfde14ef705f51 SHA512 7a4a9b1a8774f9ed632107d316e24a606770da189ec5bbd06adaf4a47897cad097446ec9bfdf047cb1ab8347f845887cb8c673156be1ed6560ffe3dce57c70e7
 DIST gentoo-kernel-6.6.32-1.amd64.gpkg.tar 147384320 BLAKE2B cbb095a73c7d1131486110b342904eb1fe2a712b56d361a027fd964329321451158ec0e5a29a1f6709ba3f455efe7eb858c629a8a0a4eca244f6827de7e0264b SHA512 c711d6c86a57429c91037c87945616b4b99f1ff268336638591e06dbe37b791ca61236edafb174346b6695e78247793dc2e2a714ed48fdeb076f9d450cd1ba3d
 DIST gentoo-kernel-6.6.32-1.arm64.gpkg.tar 119357440 BLAKE2B d84d3d0cee04a1f545b97b675b4c84d411fb45ee5454aa0cdc4407b396a1b5623fed095e1dae4f6519947ee9669a7f338b6c4a5f200d3c34507d41a4da93f04c SHA512 8e979b6913220cd4df4dcbf2ff84ea516a3c17fa141862352d8924a0e9b817d98a6368aceab4bdb0476203831e32705bec11314136b5761f68107513a264176a
 DIST gentoo-kernel-6.6.32-1.ppc64le.gpkg.tar 64419840 BLAKE2B f65e2d413cc9fd362b5708da6376beabc92393ffef64ba20526a71f31525d5ca3a4c8dcb6c2c1da7abe7b3327abdf32a297986763cfa972335a1c94023c88141 SHA512 a074ccea453375f11943ede64ccfe00ab2f212057c2beae20b67ec85038bf0c7b320ff0aa1aa9175c992c0ed35eeb8b26dcad1fea144730f69e1ea99c43840a6
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.96.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.96.ebuild
new file mode 100644
index 000000000000..e9784eccdc80
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.96.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2024 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##*.} + 9 ))
+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 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() {
+	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
+}