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

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

2 files changed, 144 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e3c8cfde3d9a..97c7203323ae 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-126.base.tar.xz 6431744 BLAKE2B 2396a656d5dc3fc93dba49ffd5cd
 DIST genpatches-6.1-126.extras.tar.xz 4060 BLAKE2B 47bd1399a522dcf4df4b0a7614f92af4bd248862aa3ce68d2996791d3aa055e917df44e6b4acedb4aa45cf4c18fa435da4fb3f28ce1d28fa15e78dadf45aad39 SHA512 871d52af95cd400fc095849c0273571ec0878c646ca966d8c75f7dda19a6c39f2c1f862ec51bda565aa9be6395eb7f9092864147bef09a1bd83ab037922537a0
 DIST genpatches-6.1-127.base.tar.xz 6449936 BLAKE2B ba2e6b0e5968e00205bff6eebe3d120fa674e372b80f835e48569eb85461437b62f4a9fe46a86b0d05a5eb0275298b7eeef608eb26d097f1d10726259b4737cc SHA512 a1716e557bcd7749621caeb463845f9b9a059d20044c4721f988489e9730f94da4fc99c253ad518fd3513bd45f1a7382701cf05a7269e63230127027d83c8c20
 DIST genpatches-6.1-127.extras.tar.xz 4060 BLAKE2B 00bbd6f35eb62ca43804b3900d1281aa1d578a9666da4b57d47851fa3842e86c276dcba4ecdeafed75c64ddb840f8ed84539261650329c272881f4d074b77a83 SHA512 5bfe75a37ceeab697314ff24d509061f4154bbab6a3c755875d4bae7dae5d99a012ac5d07cbe1979517a6da3fe6857f0162565df337c055ecad6d3e5ce4529ee
+DIST genpatches-6.1-128.base.tar.xz 6459108 BLAKE2B f27a537be69a26717ac1e251d7530b97f5f4498a088d80cfccc343b4d50bc7404e59ae9285bc06e4991e166121d52b8a84054ef8b8f707f242626a49ac202a5b SHA512 53277c695af046fd4f8c6362141317270022a4c18764b3563b47375f08f775644dec0929086108c5ddb1f8de8bdf8bdc244084fe0ea4a93fad1677013ea1c42c
+DIST genpatches-6.1-128.extras.tar.xz 4060 BLAKE2B a4f0e9f0b87dfaad00ff0b702b85c6e78c9543bd45887d6f8c550e487f60c744b2912374e972f1bdcff8de6a434d09dd0550579171764afd9a5c741a4468d743 SHA512 b20dfc8580a640d0c9ea07b7b21b38e9632df4705b3a5ae9cfd7d7cad0554b3159ca6cea91280e2a6232d2a2e26bc485bc23616c23e24bb87c5dcd60f8325558
 DIST genpatches-6.11-10.base.tar.xz 757872 BLAKE2B 72566af9a781288f516dcd30881851fe371a0f3d072aeabbd9d3e57ea96896cb9d8f0d594f8729215baa83d9546c675789b596dac5781b3640e963059d23223b SHA512 ae04d309e3b97cfd7f09993cf297fa5825c53e83acc54805f1f6f2d09cd07aa1715866be3d59874d0131d1746a398b9449fda1987ea6bdbd66402e411569d874
 DIST genpatches-6.11-10.extras.tar.xz 4060 BLAKE2B a94b8799f6c1d338a17e25b1dde6aa616754bfde092eb5ad1da11a6ec8b1107dce827d05ecc756a4918339329190e6572bb089de89d9a11c8c08f067eb7b269d SHA512 1a166a0054827ac9bef700d075cc2a1e3934dbe7b7aa64b34109b521f5bb21e231d59be4643f6faf702e5d0b3cb7d82e8cc1ba1f77e3bf88c38f9b6ffc61e35f
 DIST genpatches-6.11-11.base.tar.xz 775800 BLAKE2B 96407b5f017dc4f59e07dc51d26222ecfa70c4575fd511d273bf603f69aeb826d811d73e51b9425fc3986a369a1a1ea2dcad49d0064d27c586262f5ec2c1b2f0 SHA512 0148bf938c34d063ba68c3de1535c2e7ae7d1c66e75ce3d9106ade4696ef391511dc3342b5919f3eb84976ba334123ef1ab1ae3c63a2a63186e02f08c9cb096c
@@ -78,6 +80,10 @@ DIST gentoo-kernel-6.1.117-1.amd64.gpkg.tar 72632320 BLAKE2B acfb95460c695ed11ca
 DIST gentoo-kernel-6.1.117-1.arm64.gpkg.tar 65587200 BLAKE2B 5ee2388f929f51b65455b9844d9755d9f5500b69499f8c341e7acf8f0d5c55cf3bcb400ed0e678bc8e81338c8d44f73df64a38fadb624fd6fa62f2dc9a8a07ca SHA512 f3fb02b9b0fc2163e100eb98e83dfd0980f693fd22ae7581f8085b02a7bd86b4c9ac25485700aab573b3b5b876b12ac8613a5df94e8bf10acfa4b0159c6a1899
 DIST gentoo-kernel-6.1.117-1.ppc64le.gpkg.tar 59852800 BLAKE2B e7d7d67bb17bbfcbca8e93547be0141ec8f25d73030601f4f185b57d5dd58e7070ce3a0e0c2224a575231ecca5490a5f22398e09682dff05922650f9195e29c8 SHA512 938669b7a9ef4c74e8954133f921e5e87d6402f506f0f55fe0cc40f64396d5987f73dabc062d89c60edfbad5e1020bc08f1577e209bd2d5476855b1ba63169fb
 DIST gentoo-kernel-6.1.117-1.x86.gpkg.tar 62177280 BLAKE2B 93166c095c2270bacbfa725f6e3de044f337f546df36f7370bc1446eab8877d60bdef9c19cab68ee4550b350abc76112250ade322688d3384df996e311f3237e SHA512 a5fadec4f85be7e0ffabbdf00d64cb181eea8b7dfe80ada8bf332dc887058668d74e54cdbdf29ee79f111a11cbaca340aa5ba2c5a6884c16b4bb405a4c1b7195
+DIST gentoo-kernel-6.1.118-1.amd64.gpkg.tar 72652800 BLAKE2B 2dbb58f191199848f22696c142ce9d16d4b4b775b33516c2f602485381dcd544e6120b188dfcb1a6b8a78791ff0f5d8d6b3d33d469628de51fee0420f74dfaa4 SHA512 8019a42d17126d12b775729992d6bebb442e70c3db84a1c466c19822052a9ec5b28f3458d434734ede285249759403e89950181ad8c86eab8b2401b161cbfe13
+DIST gentoo-kernel-6.1.118-1.arm64.gpkg.tar 65587200 BLAKE2B 0d6b865e758b7f0c0213b5168fdd4290431efda1bfe3e7edb3b09b5bb13021e95c286a3511e9705b5584b2af2be474af9d4f7f56c90519bc3186dd747f8cbc64 SHA512 7ae9d2a3de6a9765558b0b116621b84fbe4a55d5abaa130a4d3c190ed70686003175fc8eaef30ae2543b91d4c7bf9dddc4e7b87887ece37b24469bae6c724c13
+DIST gentoo-kernel-6.1.118-1.ppc64le.gpkg.tar 59842560 BLAKE2B 260508ca2dbe9c09db45f38e3272864f12250ac419df515e33a1e180d3b86c801984f2e52b56a731edf8244c16483171ad7cb5bb5a44a67247a55f55860834c4 SHA512 cb7a7641c249e105edbc9ad0a8e16df619fb53a0e3bc600be3f33232096061283cf9f6887ed1516deb334083c35fc46abe14862107fcf92ff74de70d0417cf92
+DIST gentoo-kernel-6.1.118-1.x86.gpkg.tar 62167040 BLAKE2B aba8ba623ca7b3a26cfce701a68ae199717dfe0c529de6ca2f0b9d76ebf25a996954209fb7c0a6a3d989b1cd2aaa67f0fa57abe68ca077bbc0375c12f48e7505 SHA512 9913900e78a9d5fd5fc9aee145714482ee5ae71c4f9495935ee4dd760d452fc5b1e60a56e01c8d00c68bf6bf25af3e60e9581e0d4c9493e796d9436a2a5cced7
 DIST gentoo-kernel-6.11.5-r1-1.amd64.gpkg.tar 291328000 BLAKE2B 9c1ba7d9cf2b34577a5fb2235619d0ee4cc35bc47923dcb6593c080caaea5ce3d0e1e9d31454ee7eee3417d30fd9a6e288667434b5b799180d9439b93a2194ec SHA512 73355314712a784bf44f5b1486eb929cca45c1643c1c57f8d81a853218fae27752106382e364a5ee2be7ab05dc6745ce81b118bd730a5f24538786a90f1fdf80
 DIST gentoo-kernel-6.11.5-r1-1.arm64.gpkg.tar 268390400 BLAKE2B 946224df401b5c18884f5bf10379862d2536c672fc7962f0f83eeb1966d897479383ee33a42ef692ef4ad4bef9a750740bebef36ccede5c4a3673635a4aafe0a SHA512 dc7d31cf8387ffacb370ce6db1bf830549c59e7cac744958b353062cc9a143370b80232070a9a32d324f9698f166f81da83fc1d93ac6e8dff103c61a318319f3
 DIST gentoo-kernel-6.11.5-r1-1.ppc64le.gpkg.tar 72785920 BLAKE2B 9865a9fab8030c696d8f84dcc471a9bd8432e6cd603b23e6c5e0fd181ae06b8f76255603d02cbe2767fe2449677be80ec4f0488987f56675df4e3dee41ba4a7c SHA512 a3971900701d743619127eaf8b9072e0c6f0b188e744de4433f3edb59f80adec69316682e3e2d2d787c26f891664bd33373d837eb7e205a0219d5602588181ff
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.118.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.118.ebuild
new file mode 100644
index 000000000000..53b01d5e35e1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.118.ebuild
@@ -0,0 +1,138 @@
+# 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##*.} + 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
+}