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

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

commit:     cefbad26a523cca0a154ea6c9113338a177a264e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 13:43:04 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 13:43:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefbad26

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index a77eb0f5046f..60eca57dcb81 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-117.base.tar.xz 5955428 BLAKE2B 92c1aeb4d98cbdfe8d83691c76e5
 DIST genpatches-6.1-117.extras.tar.xz 4060 BLAKE2B 905d6488cd4f499e293bd6f2bc0d9ac16b073ce543c8cdbe76aa6faa2842ed78fcd42568ad53d3f9c56e7a2065a0fbc63412988aa801bc6050897459f8d8d39d SHA512 c6b4b85b6d02e04383c59749965776f13fa22719c4527b030862831237355be9e05e655b112489efadbdc0fa5574a2ca0e5f57948d4e1323febd9bf20f2da8d7
 DIST genpatches-6.1-118.base.tar.xz 5971280 BLAKE2B 361e76404976baf66412e6eed6e7158758a717f0c7f47d7c6e8d1e6f6f78d2a20762e98054b2b9318c5d0e18ec66ab68b54d914e87e51d1e02d7d20c44a8722b SHA512 465d6e70f75bd3cadec5b324e418a93e461ada9a14d5501736190f61627f82e44271b9513a20add99d230ada8bf2666a3c431b152e69363403883b125c607d5a
 DIST genpatches-6.1-118.extras.tar.xz 4060 BLAKE2B 4c070ac173f5504aad3970756c78f48bbfbdba6f690b412ac3258e866a92851b631c1d7a19974dbea22bfd58fc784d39a41499f8add80df90c3f26bd23c5adce SHA512 7a0b27f54e544db7290c371a88ad7544a8e03f04172f3fa063dae05118f2ec5eb76d0b78dacfa87122371ce3a584cece17ea0ceb7003d5fad3a1ff97e26f4696
+DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B 1867fee7c4a1e50bc7b59ada634ab0c154d7c033faafebf9429e1f181d2a6db3c6a3b2be30384fc057c5390d9407f0ff0b4eafe8b527710e19f0fbe24335cdf7 SHA512 efb447fce7090a28fe8ff7c88296bda5d424dbe9837fc9a784f78435c810421966ed0a46e3c38631cf00fede81be8379144ad5d38f2dde2b65578a89016fe623
+DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B 52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1 SHA512 088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
 DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B 6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa SHA512 3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
 DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a SHA512 a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
 DIST genpatches-6.10-11.base.tar.xz 553020 BLAKE2B 11a958ebd8848d9023a9cdcb877039ba04f72169ad78e47661890d31b73ae7a9fbdec8d12507a1d16eed08ba59f4a6fdc38ed8b6b02d05cb44198dbfcfef31e8 SHA512 3a3c1e5cbee053ab4c9c731bafa723ffcdfc8179e62fdc0eb16469a15abb5fec8ef4ff395305fd4502ea9cab70702e071f6cf9d0397cb185a987e8fbc880123f
@@ -56,6 +58,10 @@ DIST gentoo-kernel-6.1.108-1.amd64.gpkg.tar 72611840 BLAKE2B 2e2bbf323c5f808c043
 DIST gentoo-kernel-6.1.108-1.arm64.gpkg.tar 65546240 BLAKE2B f61f9c4f0e0121b90b147d4f958d67901ed66f0acac514279ebe7eb445cf3c48627c2d68c668f88540693225ecda32dbe75ba5c7dca0d5ad08df5e2f5bd56ae5 SHA512 f6c313ee4f82528fdeb6e768c4f0711590206465459b860e6f24e354a6a2605c72c2a8d931fca09077cc375e033e340c6b705a45a7a934ffc29b69aa9c3ceae2
 DIST gentoo-kernel-6.1.108-1.ppc64le.gpkg.tar 59801600 BLAKE2B 74481de02be85d9dddb84a533e7b4ec3dec3a7fa250690444a355be8b1419db15527dbf66d75d500db13443e19c30f26d3ecc048b9240e181a6da4a695b96018 SHA512 3c6a170034260eaef4a99db649703cb6d1dc0589275bbe60993dfb0bca7eaef403f73c6c9ef2e937c2ff2b3fbf759ca6aaf3cb675f1ec9e130ba755d714b8efc
 DIST gentoo-kernel-6.1.108-1.x86.gpkg.tar 62126080 BLAKE2B 8afa7992f2785d7c046842d8f92e39a4a2d0f30c39d3306384b9d1f0df1f4eebd60ce3b28d9027817d7fa5c3b4f4a66772146e53bc2d52f10cb8f49037c0fc76 SHA512 d9f1fb393b4f210ea7b065f9d4d182e6342e8ccd6ac5900b7f04859903b34bbfe6313218cdfe74a44660c0658232c940bc99fa4132b3ef9b7da99cc2849b8016
+DIST gentoo-kernel-6.1.109-1.amd64.gpkg.tar 72622080 BLAKE2B 443d8100995db6a2b87a442de1f8c1a44f40d4c9bca4b84bf37f9b3dd86ff3203c364473d83a5c076927d2f1adf74ada4549024dcac5a7f73846f5fb8975d266 SHA512 e1cfb138a44029f03f75478a7d961de98db000190de76626cb8454c8a1e3a464e53be06084b0d0b1da7c15c6ef531cc654a24ea1e867c26a260b14bdf3e3fd0e
+DIST gentoo-kernel-6.1.109-1.arm64.gpkg.tar 65566720 BLAKE2B 4da6ce06ac80f10954872a29a0735034c4ec0960878d00349903757d1e82066de30f8f85411e4c579a74a5482d2ff1eebc9e983fd1457f2b5c06ab5386453b1c SHA512 48c41f8073f8d1ffa8f0d831c867c8fda2056702c3e1efda90ab4a4dcb547c087884d90d9f775d61a386a2b8a196029684fb34eaf1b78c522ef265c9573b8794
+DIST gentoo-kernel-6.1.109-1.ppc64le.gpkg.tar 59801600 BLAKE2B 456fc2b1fe73468b04fe74e89a90529a64800074726984d9974acfd5e2d550689eed2433b5cb7ad2cbebceef801d9be867f6ca9b830d2ac2f91226aec8a7b75f SHA512 c7108452a7ee4035f56578f783fdfb34d6848a9dd4411e159ff8c9581e191f6dd6351b7df4772f3a90a4d939b4c30cb6a335a8b2028dd24982b69f57ecc647df
+DIST gentoo-kernel-6.1.109-1.x86.gpkg.tar 62136320 BLAKE2B 88234cc8cdcacaa630db568a6a2d7e6cfad043a735d5a04782e5ce7e5b030af70b4c4a73200f95f517408894bcab348fb354f24b5dd0ab37f1ef818eed7ba270 SHA512 24d76178fd313951b440492bbb25aad71acb840bc18122c4192ad72e28514582a07ea15f4c58ca263080ecb01dfe0f34120d512817ae429f0652e98ba750dc3d
 DIST gentoo-kernel-6.10.6-1.amd64.gpkg.tar 162723840 BLAKE2B b06364ac6a1cfd4cda5d03202c2c83c3ab35fdb886c0c75a25900f113c6c5d68e8d6a5a3c78412301289555ecb416037260e6df9ea79f97c9c73a96f2e478284 SHA512 f3cb900ec088c4b856567bc5e4fd6d977672310f0e6e61cb4301650b14e080778859783f8446e029c50acd4a8a29575aa3f3f3948a008418968a8d016c9478c0
 DIST gentoo-kernel-6.10.6-1.arm64.gpkg.tar 131993600 BLAKE2B bf37c8d5a9ca3dda972cc7a08feaf12b22a880216767892b9f95550e9b31f7e824b74658bcebf10343ef441c6e1d2e4a28145d927f19ec644ea4246cd1136d55 SHA512 3a72d06ed8fc7edf1ef6ed702940cceeedc16eb9ece430cc0c0faf34cce36a0a9ee18f90471cefd0a6a6e87e286855c98f94799683c22be3cc14b3a1e8350032
 DIST gentoo-kernel-6.10.6-1.ppc64le.gpkg.tar 71976960 BLAKE2B 78f76bb3fc5c6455d99a9f55a82b2b9cc8a07529635e3302e9a7f02aa0e869f669605d93e63b151ca5eb5014915a7d5be64a6c0caf0c10a322dee66b0456617f SHA512 b20fb195cce8db548671b4622319d50d751955a80e89f0814253879112fa8943a92df195eeb2e6b65f14fe134caa5e514ac18f5457eb41bdde2f98b2fad2c25c

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