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

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

commit:     fd91ed3ef727d647c615ae2a715699497118bc7d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 18:30:16 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 18:50:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd91ed3e

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index c74511839c50..ba00ba006dd2 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-121.base.tar.xz 6065048 BLAKE2B ef60651e53c53c2e918da2c9dd47
 DIST genpatches-6.1-121.extras.tar.xz 4056 BLAKE2B 23ddf1bf6ee9d2790e952777edaa577916af9897a957c4e2f4714421ad7aae213b82e1c7d7b911a65f3ee6b27cefee4b5839d14ef1b0e539fe86d91722d0295c SHA512 95d167e2d5f8e883136923b332e662e8475043e0b2324b06a3e718a2bfb7e8f7b87c1cf0961ee06b0cff7fcae1e1dbf7446812fab7237416c281033f6777cc49
 DIST genpatches-6.1-122.base.tar.xz 6092444 BLAKE2B f612042eb0f7953e5842cdcd3bd1febe169aadc6fe36dd27a58cee9b817f51340941c5b47724327deb3a8c409ed1da3f932589d76d919a05ef9f74a69d8bd6a3 SHA512 95d9cbe363363f515af9a42e4d099a2de2e3e5276ed9a1dad9de0d9a4da8d8ecbcaf0b82a8e36058794a78887658e6239e1408ce24fecf4bf099a6a5e6b19d30
 DIST genpatches-6.1-122.extras.tar.xz 4060 BLAKE2B 7578edf3c61e6da2c9d6049d3bab807eedffcb2bb8add0d0c1835c2f5d292ac4ef2b83e3595342745a2464bf4f4c60e39f82b342e84fcbbb33721ed5e1382b6e SHA512 44c7d3dd62d2efdf8f4a9632d025121b429d48cc4bd7f8eed754d7a0223be9a201673a10310dabee04ca29188193410d82317da02527f4016bfbb4fb6622bb8e
+DIST genpatches-6.1-123.base.tar.xz 6330844 BLAKE2B 7095b2e44e1dc34e38d017255057cf035ea9d129cfcd4f778c51b5b35d2f3bddf9bdcd649a4db23b2725496d7a4ba07ab300094cffb12222306424094d796a98 SHA512 ddab4d3435814ad18caa88bbccbaa8619945f1f430589034ba47bfe2e313a8adf5ea2de2e1220af24fa5f0add308a6eb062391c85835e91be0efa236a8402dd8
+DIST genpatches-6.1-123.extras.tar.xz 4056 BLAKE2B 13343aefa58e0c36894a31f45ece3e90686c478b7955854d458a358f30f5fe1a058ee4050aae883e31478d47ae8d63c566bdc032e3cf998af7c3c2c5f8529ce0 SHA512 2bf039625947f5120cd457639f223297ce7b073b3c8650503a994a944507d4283f9873929412da80d0c0f5252bfab885c7b52f48308443fe809900f43e1b980a
 DIST genpatches-6.10-14.base.tar.xz 759584 BLAKE2B d08dc14d5126e73155a6b1977ce2b9790a5717b6bf1fa31309838c3884a81baf945661093da2e3f69bf892f472db60defe1a001afa4b9a6846deee11cdf6cec2 SHA512 6e41093c8ee9690ec279a3f35c01d058ef02c3a9eac7b9eaa3908c14463c8d3c85497665b875111fd1a29e8d406706aa6f6791a44e0bc31d8c51053259a18d87
 DIST genpatches-6.10-14.extras.tar.xz 4056 BLAKE2B 63d33a29efc77a7839f4961de62c54f2383bcc7a119fce5ca7f80cdb66515537bb1e1bd55bb50f297b8f0a9c74f75bb237ee2893a859abe6d7f05864ae21e38b SHA512 c9adea40fdfd3faa5ee24a60be9ad4444819a8fbcb417ea98ce2f7a02fdd1e70c6f1168380cf6efd5a4d1820bea14db48c3064b271afaad8e1d23f0a8263a48f
 DIST genpatches-6.10-15.base.tar.xz 774884 BLAKE2B e5363896fadb615a40b43b90c4146f93aee696c0aeff3ceee6a8d60882112f90b8bb1df838a827353d290cfb37aada5b53b673cc21dc611e774a4b7376fd12ad SHA512 dc45ee28cad09a1ea2005e6eed656b4fbe7e9d291571583eaa57388b0b3d08f769bf10752aeb7a519dfd1bad679bf277114fafe49c8243f78b9bd7548935a21f
@@ -62,6 +64,10 @@ DIST gentoo-kernel-6.1.112-1.amd64.gpkg.tar 72632320 BLAKE2B 8474be100855338a36c
 DIST gentoo-kernel-6.1.112-1.arm64.gpkg.tar 65566720 BLAKE2B 10838f7d4ea9ddae3d2796f5481789db4130307deb9d5a1f8f2b7eb8a02462e42929b3d660db1076dd31585b5629f997e6eca8a76a842a3ed062394e7e34fb43 SHA512 dddcf9b12ab1db52e7f65caade13183246d34f2ba335380cf62b7c02692a4f4307f9d94d9af0fbd8f3abc8b2d7dcef9b897f01ba50a1bca98cac4ed5cfd7d989
 DIST gentoo-kernel-6.1.112-1.ppc64le.gpkg.tar 59822080 BLAKE2B c5b9bc1d7578c8a9357812c0ec737a41eff4e9ea0c08f26560b4f58506778edeac6f2e1339cc969b7d3d3c4daca74d5f40295974de4144fc8c8fd109cf65eb6e SHA512 4c66039b95f6aa27cce4f4fd93394e8253b3de7201a5ab209adef2ffd4307f1c1e1b285769a49fe7509524c3ff1367674de26df109a0c1817401dc88806b0299
 DIST gentoo-kernel-6.1.112-1.x86.gpkg.tar 62146560 BLAKE2B 97eb3e2f92a93356cecc70cd22d31201486c6eb973ef0e074d50a7b1da0df940950bb5cea4a386a562edfbad9d124e673a19f15dba256e6077846ea447902e40 SHA512 453f36770ba81309952baea95e9e4917401755b3c288819d6747e2c70a87fb79dcda2db79ccca2bb566fee4501914bbf9093997d199cda5f703d1dd06af86bf8
+DIST gentoo-kernel-6.1.113-1.amd64.gpkg.tar 72611840 BLAKE2B 19c9f713bf9334e3c2f991c6738ae88f5cd4ff93bf190e4b179b396cafb8ff80453f6634da4a8ba2a7c581d6e5a36e0f06aac9c23d940496697e13fae1b5ae1d SHA512 fbac2ef4e3f02f180e8b76c028131a74c15815908897b69317c2910637814fb07f0e55069c4b9189e3262aed76bced7a73861a735bb2cb8f2f1e5189086f8da1
+DIST gentoo-kernel-6.1.113-1.arm64.gpkg.tar 65566720 BLAKE2B 289e6c920d3e4ea18430c04b5371ad849f8cb155289457c55cfbdf9dba70af03d490e1d8c5383b98075f7e1ee054550621589dc3a26d06307b6ff6d66ca44936 SHA512 b597b095b1cb80befdbc6e412a07713c8869d082bedfc066caa8ba18678b6467f888bdbaac04dabd68b229b33041eba231e78cfd52aa8c2bc886c57655a465ca
+DIST gentoo-kernel-6.1.113-1.ppc64le.gpkg.tar 59822080 BLAKE2B 10547bba1287be3dbdce60fa0238ec1d9a63af970cfdb7d3fb3a3037ab6870db17d5cae14aaf349fefce1e66ebfdfac86c639b6ce4b96813ec7a8bc2972664b9 SHA512 0bf62fc17b6063ed1df477c016afe8366a0936a5958d5e69ee244e4aa9d933f1abd0f462de0278e3e6a82908e2d0fc57e0c8b147be52ad18b721b53e60722fbd
+DIST gentoo-kernel-6.1.113-1.x86.gpkg.tar 62156800 BLAKE2B 617f14c32c220c89f19f9c7386fdae50b8b46e0eab599c05c193ade009f37611d63f1a710f84785e42c0cf151be558aab6faa1e4bbe49f2294b191d299b6f7f2 SHA512 964e18b70e534d51196307ef4b5f8cf6c580dbd8ae42fe744c90b073520583908c271f6659b8c944c1978c89bf5ed812bf51334029549fa21bfee7b1eb7c0872
 DIST gentoo-kernel-6.10.11-1.amd64.gpkg.tar 288471040 BLAKE2B 7015cbaf2b47d62f516f3ca190fa805e5073de7d8a8256a4d14169ba64f4faf7804157a96563d47029a7a05d191e128acc5413e1b5cef277bad9d48ac57ef1e2 SHA512 b18b1ac7d905a24517f15adfb5a9f40ef4b3dc27c3114d67373aea70f1ae7e35a9ab19ed9238f99ecc271a919b971bc4cbe325c0d478a976e7659018504de6fe
 DIST gentoo-kernel-6.10.11-1.arm64.gpkg.tar 264816640 BLAKE2B 412355b2787647c1960f643c90d06f739fb9c7d2dc655f77f1c8c90d2f83b1a86a01a034dfae05323014f8bc72ce897fbafe42470213f565f26b4c757ebacbb5 SHA512 63fa9896ebd67aea2596186151e577d1071688001798bb889d61ebe91ec8db0f52d1aac7ba3b7c44d59d302a2331a696c0875f6fb9daa4eba4182d2790450812
 DIST gentoo-kernel-6.10.11-1.ppc64le.gpkg.tar 72017920 BLAKE2B e735783122186d2036ad6c5ab8bb4e3cf3d16093ae793d5b7295ecc5b250f9b07430ef5fc42e67f4da69023c11b3c9f6874254dcf922ca006358ff2458c3e383 SHA512 19c8e6e1c23eb767a18fa392dfa5a5a9cd67636221037fd4becb07f375afd851607886dc7a4c8231406c7be99961e4bd4c2a8fc1477fdf484c4c43c12842eab9

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