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

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

commit:     4b60244433b80eb98cdbb45c6e6e64e1b1584e40
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 19:30:02 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 20:10:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b602444

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index add7edaf3197..457d7ca622c4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-125.base.tar.xz 6398228 BLAKE2B d22a9c9792cd0118b14cb75e37cc
 DIST genpatches-6.1-125.extras.tar.xz 4060 BLAKE2B e3e479543a260ed1c7caf3d7faa8ce19b88a6f0f84e05b5ec306da5bc118e540d4fb7fe43a8240659b52d929f32ecd50d030280d4848be034c370d5d22adbbb4 SHA512 cca2043706427395dc7a70b92f102993ea1c9505820523486f3a57de718bd3fc4f94acd43b8c4bc4103e37fb5d341d61bc028381b589e021c894977dd8473ba8
 DIST genpatches-6.1-126.base.tar.xz 6431744 BLAKE2B 2396a656d5dc3fc93dba49ffd5cde65c901b3dff67b207aa56f3d518debd8890d930f0853e921bb1f0224725bf78384dee976cc254ba9ba57ea94de67af4566a SHA512 b62e1650be9b2bc1ff050fb216f2616ccb1748b0db4c3faab5cee25cd3c8fdd321c90d9d8d6533debeb7a56fa997c56a12ae42ffd9192db6d6d6b804ba30055e
 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.11-7.base.tar.xz 562312 BLAKE2B 80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae SHA512 02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3
 DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B 073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd SHA512 0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8
 DIST genpatches-6.11-8.base.tar.xz 639004 BLAKE2B 218ff37e8fb82b4bff3baa5b197b4c42ec19a4c5480620982f7befe8313f0f226324a629d6c15eee230faa3fc7c5bb558a58ac94e2e9b0259823c813220681b1 SHA512 cccc58e7ed24b90db88b14f9a693ccd021b1fa1beb9568511e344807673d2e518a66b2ffb48773a5d68da03ad15671181b7dc53bf2161ad1a88e95b555389116
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.1.116-1.amd64.gpkg.tar 72622080 BLAKE2B a50e6d84c73cf274c51
 DIST gentoo-kernel-6.1.116-1.arm64.gpkg.tar 65576960 BLAKE2B b427ae68f570c10f95405073b8798e1f27754c04334afed582a1c266afe79c35e9dd67d9669323996048b2bfed42b7df6a8ccb3fe73072ad86a047c4b282a415 SHA512 5c51663aa71947c178ae0414ead3828f56f6e3e918f28e61aaae49983c93675832c368f2e109f874252a06bcc77429c86403bff07e3a941e75c942160251e0a6
 DIST gentoo-kernel-6.1.116-1.ppc64le.gpkg.tar 59832320 BLAKE2B fbbc2404ba8000964c354f476c96e8566e46075902fbc19ac0edd29be62114e951538f32476991c0b3760785fbd0c77a676bcc11b2097ae55b595309c41c42b9 SHA512 816821feaa7cb5a7a00771692d261604b9c5912ba26e2a6dd06ec5b9245aaa9035e18fc679fe1659a1b0962875bd187dae1a614a5e4a068d0fa07b5ccde19098
 DIST gentoo-kernel-6.1.116-1.x86.gpkg.tar 62156800 BLAKE2B 8e74cd873cdf57b08c99c54deda815ccde13d940d9d80bd71240c8cd4b68c5b2b2bccc1bbfbe46604ed7319ac1b03233102f648d9701290beedf9a5adab7faaa SHA512 8dceacae89ed21facd07e798c1453b5e488e2d0043342d2f5bd72f545418df83004963deb519be3afbe6f963ae3a61c339c82cfc38f90f42375f71f89dadfea1
+DIST gentoo-kernel-6.1.117-1.amd64.gpkg.tar 72632320 BLAKE2B acfb95460c695ed11ca360824ea2b64477772e7ee4a6257e2fb3a7e77d53ddb8143924f8d9101928d3efa3c8907996a64cce281e77a3deb0e305b11d7d82b31e SHA512 cd7aab7278ddec49aa364576d21d5cde135dfe3087ac4875ce8a745598b3bcc21111ae42261aeeefceadeb33cffb73981d7f318d0ba4f8550d3c497bf870072b
+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.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.117.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.117.ebuild
new file mode 100644
index 000000000000..53b01d5e35e1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.117.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
+}