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

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

commit:     e47366d37477228ffd287b99628c3732fbc898d7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 15:16:42 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 15:23:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47366d3

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 703873a1eebf..6f2622660f5e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-123.base.tar.xz 6330844 BLAKE2B 7095b2e44e1dc34e38d017255057
 DIST genpatches-6.1-123.extras.tar.xz 4056 BLAKE2B 13343aefa58e0c36894a31f45ece3e90686c478b7955854d458a358f30f5fe1a058ee4050aae883e31478d47ae8d63c566bdc032e3cf998af7c3c2c5f8529ce0 SHA512 2bf039625947f5120cd457639f223297ce7b073b3c8650503a994a944507d4283f9873929412da80d0c0f5252bfab885c7b52f48308443fe809900f43e1b980a
 DIST genpatches-6.1-124.base.tar.xz 6355616 BLAKE2B 8b912dfa6afd71b8d2cfd709aefb7acd2df66e7806e19440db7ca74a6dc2fe13b2bc55b332aa1b4aef5c84bf64929a20cbbf1da5a30803999986762327eb56ed SHA512 1288c21d553220dc27e28ae533f003d07de5442ffa85bf06cf533266b3a16549239f389d61c7458b3f442f8902bdf4e429f2a17b89bacfe8632fd38147f97923
 DIST genpatches-6.1-124.extras.tar.xz 4060 BLAKE2B 326344cb6b4df76db97f5666085d26a8907769b81bbd1016219f319b713c5d2e467c0c0641b1cf5bf7eea80c7d865544a1b6e77b432e002dc768f633d70c9941 SHA512 a440486dbce9c6b291a202200089b03669bcb7c5fd635350f4f2d8eea21d67c073ee7feeca95e62fe96673dd67c92632955a83e003cc49865aef6b84f67dbf48
+DIST genpatches-6.1-125.base.tar.xz 6398228 BLAKE2B d22a9c9792cd0118b14cb75e37ccd526ca83840ba6f67c6cf1a0d8354094092cc1fa1c089634a5d60f6170e46183cafbc58943bb6c09d7a8eca6b44ff08f412e SHA512 5d82330540e9919e3339fb26431f787ca338550dcf85c5a91e573d4e3197eb9999fd653673d60a453306930e2126ee375faae67f4a7ceee7bef8af48500f91a0
+DIST genpatches-6.1-125.extras.tar.xz 4060 BLAKE2B e3e479543a260ed1c7caf3d7faa8ce19b88a6f0f84e05b5ec306da5bc118e540d4fb7fe43a8240659b52d929f32ecd50d030280d4848be034c370d5d22adbbb4 SHA512 cca2043706427395dc7a70b92f102993ea1c9505820523486f3a57de718bd3fc4f94acd43b8c4bc4103e37fb5d341d61bc028381b589e021c894977dd8473ba8
 DIST genpatches-6.11-5.base.tar.xz 531212 BLAKE2B c9e98632ebd2e74f59dfee66d13f9e4cb515d87fd5f6db946aa577e6fab49251b6d374cb1cafb66b2139a8b75c683ed58557745c8f17e18b14f7bbb417579fcb SHA512 a53eab3075e55c7a7ab82f99fa853f08b054ed0fc95d9008b17b5571e370ffaa53b87662bacec8a4f5309309e89df1282f6b5747df595c8617fdde74c1222cfb
 DIST genpatches-6.11-5.extras.tar.xz 4056 BLAKE2B a09e9802239237005410082eb6c4294a13cb3d415be4bd83aaea52ff37f472d4ab743fda02c8cff76a12e232044a91fe2ba83e0e46055edf28a5f473cf7f863c SHA512 3556b2f09e4f9e328bb04fb1e40b26038ef98864741b517f222c98fbb75975b34ce5d091df571f4e65b707fc8a74eb395f687a20f9f8ea0d617c4c8ccf8fa288
 DIST genpatches-6.11-6.base.tar.xz 561884 BLAKE2B 8fd4ee418b02f2dad7e8599477d03dc56b7e3ab8752d9e73bec91e9f7e01d1615aaf4d14b1091314bd82a15ff443b16d3cb4be58c4a46f33a1f95ff8bb85d82f SHA512 109f1e9e562eac0c606ef621bd2ebc4bda96a26002999765e31551edc6070c46de6c24dc4387389f964fdde485aee0048e01bf5189997b84111334c2f239d5f8
@@ -52,6 +54,10 @@ DIST gentoo-kernel-6.1.114-1.amd64.gpkg.tar 72622080 BLAKE2B d91bb8f7fc369cf6778
 DIST gentoo-kernel-6.1.114-1.arm64.gpkg.tar 65576960 BLAKE2B 4f0c3a12aa09e3641e28f34cf111654e37ad1ffcf1fc1a07a20469fd7a9c68cb1f20dd75cf8765baccf0d3fc1946c0f06eeaca2df1cbd8f01b7c8e59ebc22693 SHA512 46121bbc3fb990863b0fca644f804c8749b82f96eabff6a43325f36044e32b8c9a883dbb5d72c656396095027c86e14b7916937ae7e0285eef008e3e20ef2da2
 DIST gentoo-kernel-6.1.114-1.ppc64le.gpkg.tar 59832320 BLAKE2B b13928739adee071c07efa583aecf9e57d493c34e98c0c950d6362fd4dccc9e97269d21077109181507920c787fcf9afb57ab0b1ee2110b34db0d541bda22546 SHA512 29cef05c82413550734e6a1a758ca169f8b7a7afaee239966ff2bddb2861579c2a23bdf3e4dd1501a178e24879acca38c297c61f0ec68d45163dddab998677a7
 DIST gentoo-kernel-6.1.114-1.x86.gpkg.tar 62146560 BLAKE2B 9824eeb316a51723b765895df38d936361d3de8454ff34ed9701683720e0039489e0a96f9e081cd03c32938754504b456758a9fd8ac5dc8e17dfc3a1a577cef9 SHA512 82e2bc9c1de95c900a8bb46763d5a569e6b35f0e4faa3677e8bddf7a2827aa4bc5e32c25e92d36135e44d5dbb3b17f154c8a9afc23fc38bcdbef691e3c896737
+DIST gentoo-kernel-6.1.115-1.amd64.gpkg.tar 72622080 BLAKE2B ec18a46ee403e5053ce5cce725ccb4a821c920ee12d1e2f956c7e88cb79cdb393011a6f7e5f4989c2c9d3fe85f0b8c99f04c7030cca4975814e26fb6195bfab8 SHA512 6d40299942154baae8bd5df03727b4470617c526f48ac6aec947a07c12e9d74fe43be2339f81c3a23a295d877d8d843e3987a593e281b0ed706ba4e8133a28b2
+DIST gentoo-kernel-6.1.115-1.arm64.gpkg.tar 65576960 BLAKE2B 28b212709b27a1168a63d381b9623232f158e11113d9e53f10571c9e37b842dfbee6334fdf82580ee8fefd671dd5a438d6c306d808ca0e45cdebd5a228277c9f SHA512 1cb83c8c964730738eedcc067a9ac26110e1ffd808d5099084b20d2fb16789258335010953acd747c1923f98e82424d2e540a7fc4c715e3ece95cbfeefc23b59
+DIST gentoo-kernel-6.1.115-1.ppc64le.gpkg.tar 59832320 BLAKE2B ab35871519060a89e20313ec3f3b1a9dd33455ed5a10cc95906766948c344b80e204b490cbddb84aa78e947b1a6b7ad610844e6fe6cd1e82c4be002297e8b9e9 SHA512 3838e9f8b81ca7eac4b5517f28e55068c1cdf02b2826e8e13d84eaecddc52dc1edbed53b2ca65b7da5400f3529be5a40830428f9352ccec4ac4cd13b82598fb5
+DIST gentoo-kernel-6.1.115-1.x86.gpkg.tar 62156800 BLAKE2B 22d585c609d1497d84b48d933e595eb8f12912dda6e7e7bce418143c135fe591a612e90a1af778fe8de72db3da593938d3e91149f67227339e2fe4eb9afb0028 SHA512 3a83a00b9b5e7099f13e25d93b53a596a6ebb4e1793d3c27aa40b6780d7499f1ea365bbf78cec77d6d01e75c4aa5212e8731bd7ceec12c1e7cbb8f049165076e
 DIST gentoo-kernel-6.11.4-1.amd64.gpkg.tar 290621440 BLAKE2B 3f597f34de90a39ccc5f47e71b6c053926ddbe160c7210a9fa47744fae219a66193ec6622b0bdc34e5f47f4d509bef3205d8acfb8a3b05405eff75e3064e08ab SHA512 46ad83776abe7d741432647ae1bf45849e764081d2eb36568990d52b7c0bf7211410909dfe99facd1764dd8c55e6c03434f5d367151040a114edb55540f3da46
 DIST gentoo-kernel-6.11.4-1.arm64.gpkg.tar 267704320 BLAKE2B 2b3ba4fe8b9dfde99ab2cdbd012f2405dcc20b21d7d84c6d8320f0f0de63f5598941b09f0e0401e74b6ac64c4430089803811bcfafd501334dc8d7ec6aebf80c SHA512 b35f9f0b7828199fca9746b36a59330aba701e8be9b0217dfb7497faaab59acd5a7fc9538724ea1a1a89b7c256d06cd2f7ed2519f42b031bad5422e9abe6bb86
 DIST gentoo-kernel-6.11.4-1.ppc64le.gpkg.tar 72744960 BLAKE2B db05917c611c3c2e57c84e753a95d2243ce4d5d4bd989c055c606fe8de3f99bc2bccf5d244de8c4e2aef4412ff14d05753359284fc06b9cae1810776c7c14c66 SHA512 67e7f46b500cb88508bbff0c5c90d8f22df50bb7dac1105e04dc5ec0978a7c6d9d9f57c2fdd0651cbabb1810b38c2f0b343bb041901b2586c0bf13640f338e0a

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.115.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.115.ebuild
new file mode 100644
index 000000000000..53b01d5e35e1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.115.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
+}