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

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

commit:     b0d806780f1fcc076fa56a3770d22b3a83c542bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 03:08:57 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 03:12:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d80678

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index ff4392ac61b4..bf5460f43b8d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.1-119.base.tar.xz 6000764 BLAKE2B 1867fee7c4a1e50bc7b59ada634a
 DIST genpatches-6.1-119.extras.tar.xz 4056 BLAKE2B 52ecde24bf197791cfe5be801d881d26904b4503bd3e7857b6a6a2ea1e08fd0262a7e01de498854a931c5407f90d1b5dc73fabb3eb22dd370445f7ca057de0a1 SHA512 088e01360229386b880b2be615c0661c2c247a636a4d4810675fdf576bdeac3bb1d487dac6ec72ad88f4353e418289410f504b432fa8dea61b299e2f596370c8
 DIST genpatches-6.1-120.base.tar.xz 6050748 BLAKE2B 8e81d186a9e5618d9f561fd0d49974031baa44ddb9b1885bb3ef6298d49b591e1c1582c306eddba07f3da733dea7ed82ae948838989010ee6471c052f99541c6 SHA512 7ec81a4b97becc07a15fc9e888f2e9c340334fb7ee2b9d0083123f67fdef44f7e155bdf7dd662158ea86d7eed3753017401479a5e50cc16eedde145dc77018c9
 DIST genpatches-6.1-120.extras.tar.xz 4056 BLAKE2B 2295b59dea7ee450c0d6b109da2fc341e96030616635800a02847f93c4cd0191229c6d74bd68994ac42d2a96691856315127a060cd3873af34357f12ab54193c SHA512 8e1b92d4ab4cb327868f4e06c7bef5a099339c3cf2331ceff3aa3731632d1f8f7b427da5f892540a64f8afd86d89048100b93c8a08d40a99f5760a35553dca25
+DIST genpatches-6.1-121.base.tar.xz 6065048 BLAKE2B ef60651e53c53c2e918da2c9dd4759cde88472e2f6aecf4ed6a86f089a282bbdf7acab040c7660e52ea09e441f6008f17ae3d49afcd339e8b91d50cba48bda18 SHA512 e34af3822f10164dc0729d0803c6f3ea05e57c6ac157567bdec6d8d0a3e78fc72252606f3b3160089e7b4b8167ee76b13088cf1d238cc3db2841e2dde63b82aa
+DIST genpatches-6.1-121.extras.tar.xz 4056 BLAKE2B 23ddf1bf6ee9d2790e952777edaa577916af9897a957c4e2f4714421ad7aae213b82e1c7d7b911a65f3ee6b27cefee4b5839d14ef1b0e539fe86d91722d0295c SHA512 95d167e2d5f8e883136923b332e662e8475043e0b2324b06a3e718a2bfb7e8f7b87c1cf0961ee06b0cff7fcae1e1dbf7446812fab7237416c281033f6777cc49
 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
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.1.110-1.amd64.gpkg.tar 72591360 BLAKE2B 9cf5b83a5d7c1edfc90
 DIST gentoo-kernel-6.1.110-1.arm64.gpkg.tar 65566720 BLAKE2B 53783496918cae61de0cfddb69b81992a388b1ffb36baa68d0d614805f6a67e5f422aaebc188f16faaecb0558c5d60379db8a4f66c4b843134ace937f7517a51 SHA512 4b0f3802a871e6c73e70a6bc4c856b62748da5a86d4f1b340c472f9238d71d34d89db34106b8565d99873137c9c1849f0732634332f4767a87ba76e593df9494
 DIST gentoo-kernel-6.1.110-1.ppc64le.gpkg.tar 59822080 BLAKE2B 8567c0c93616d69b4a464730b09528c789e2e5ea4b1771b4235803c70091b1990a8c6b41e36cbfbce92992277b2afe202b8806437cf4fc68e0ec6f3c3898fc09 SHA512 a8748b00b9e600720966f1ca2bdef5cb9a06fe11010491ef67dbd9f2798af46e859c0c14ff32921a70cd13b83fef763e0d20bc7467dcb7a49b5faa28572371d7
 DIST gentoo-kernel-6.1.110-1.x86.gpkg.tar 62146560 BLAKE2B 0a64ed2bff2927ee5e2120c10135942c93819818714f835fafc87129afd5bae400a660a3bb08caf7db3da9e2316801cc45b0c6ab166d5a76d0f051fcfb341e6f SHA512 60804db3018c2d8c9e51afc7838c36a2c39caf6d920f8f4fe5f80b603f7a64f1311d80209654498e842846f4e9dec5debdbdbb6328caf546fdbc90abbfb921ad
+DIST gentoo-kernel-6.1.111-1.amd64.gpkg.tar 72601600 BLAKE2B a288496b70a870f01e43b026dadffc83694e3815c93c59a62c4a4f5744a915ef2207b690157eca88ec3ca6df0588626e366e1e45e88df14329dfe0882b3d5ff2 SHA512 eb73f2865baaab06a1a26a633fca3eaaf86382af8caf020bc124b95228057f8bb182c43e724e3e6cd5cce583a0f560bf61fd68a31f4d751f4976bb45f777e2be
+DIST gentoo-kernel-6.1.111-1.arm64.gpkg.tar 65556480 BLAKE2B edde62a5bb19d1944db67e45f3d42ea586fc5d84581fa99423c28312a5c3484eaaef72429f531d829522d473aa9c141dfc2509cbb88375833ae9602b873c1de6 SHA512 0be04a6096fa192fe7c9ee3bfc4dd7583b3748fcc6d14e2ecc111b2820ecc8b0d64d8e9c5f1aad51cadf4f35ce9b157575973910959bbe71fbe66cb5fe3213f6
+DIST gentoo-kernel-6.1.111-1.ppc64le.gpkg.tar 59832320 BLAKE2B fb4fa57e3ac7a2a293fb6c8de9c1d99c587ca4adff3ba374af455c18533b09c23e17da80ad47882c34ee69f3a602a2ef7365b2c1cbac73e3da4b51db8bdd8ddd SHA512 ee8d98a93f033a50fc513d2fb4b8f44590450e10190c5cca3273119a2505f04e872be32c4e98bcbf5fad7918f3d1552b9a66426c86711ed5e0084c7692c3624b
+DIST gentoo-kernel-6.1.111-1.x86.gpkg.tar 62146560 BLAKE2B 1c7b09827b44ece7abcb56a2a611159fe3acbf53cf2a0b21a8f4d45e8d7676a71ae2985beb094c1550cdebd9b9c02954deb86602359b82ba99601af45dd8bd4c SHA512 7711a84454c0ba9b76051c331caadbaeb54352f1d11233c9ac20cb1466554c44cd019f992d5581718e91f61869dd03a7ae8b1492394f98e3749ec55f850cc973
 DIST gentoo-kernel-6.10.10-1.amd64.gpkg.tar 288399360 BLAKE2B 48d2fb4a75abac9c9caeb8a15c859209055a4dd5afd5083dff375ddc0bed8bf2c56a1acd7377343f90274c8025644f52c08e75e156eba175338e22e51eda54aa SHA512 7ea83083a8c6dfdd6bbd875445962ff31bcf37afb18d4502444fa3d135b88aaf3f3c66cef2edb77740e4bbfb226e13408197b7aa9e480c29d1576053e65a1acd
 DIST gentoo-kernel-6.10.10-1.arm64.gpkg.tar 264816640 BLAKE2B 5d70f8c2acacf7fee5637a9b0349784788cc72be4c6288dd3a8424a22c1bc9f6ecdf99e32a0b11eaf28637cdb7c174edfa1a35c947b05fd317b4d764b4a2e20c SHA512 98a1f64b138bca6ffc028a446f04ca045f06956b4243d9f2938cef27acf3c2dea02ca93430161334310527d0a91a1bfcb85954df2c731a77d506b66ad3fbde80
 DIST gentoo-kernel-6.10.10-1.ppc64le.gpkg.tar 72028160 BLAKE2B e142e685d54736c376cea213b7585198167a1a78a9a3c53b1637eba2745bcc89b4ead6d634ef105edbc66aaa7a553710d36708a3b27739137e3b85ca717d6f2f SHA512 5f5e8a3ef6b88660a2fdd3f5358bb1704008b5d565e8cd61a8cff9bccef4995f7a272c12755ab0fb90cb52d894d24ebfc60ac599ce97deabbe74fdcb305ec91d

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