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

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

commit:     2e3a6917cd74a741a870c40c30cf0c541aca4cde
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 08:20:55 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 08:23:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3a6917

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 2d45a5b1b0fb..7703f806805c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-129.base.tar.xz 6480240 BLAKE2B 4b33131d21859d29c47c54913e87
 DIST genpatches-6.1-129.extras.tar.xz 4060 BLAKE2B 494c5a4ea4fb9d1d508442a445743fdad40c7d5d6a69403ed86cc7ea70e488e9553f96db367bcaeb2639e7615ab2ebae587ac59f5e79f61b1dcd635e8b145f9a SHA512 8f96c279ff1a22ee8227fd06505d475eab7a6da06279b9a2aa850a8445da657c8ea589eb7d2fe6389cba0f25f3e797a3f7b23deb53b6a95ae4de18974461bd70
 DIST genpatches-6.1-130.base.tar.xz 6678892 BLAKE2B 53955f1a643453a96c1fa660197efbf391b44da196eaa4391b217010ef58f8e0c4d6c5dff34d8ab177fd5a2f54ac3898694ab34dae3c7bb8f7208ebe0c14d4a0 SHA512 5a3195e6e97bff0f8f058da745dbd165cf63ce0d5d89c38b984c1d0ee51ebe42c325b953f07a3cde8b817b6400bfd3412bfdb54f25c009eab85d56b2529b5a96
 DIST genpatches-6.1-130.extras.tar.xz 4056 BLAKE2B bd90d7ec57c276a6704c3674922c77744b218a8a86f5d862e092c52d23f6205e3801c294ab3e2a2d97050ca8b6d46d604bcb966ce78c3c08ade6a31a3b33f293 SHA512 6ed1b354bfc2b017ec3e9075a0eb686c6ce76ea7d73706c66b696fa8af46fa58fc35b20fadb68ca9249b64614b59aef58443349b001eb1ba5bbdae26fde27b99
+DIST genpatches-6.1-131.base.tar.xz 6701808 BLAKE2B 0ff847805abdeefee31ce75d0b5c02eafdf7b12f3b3c499c0d9d19305b3ae934194bdf58fabb30e51a356eae5e57c7d633b7abbf45a94096e981c671181c9b16 SHA512 7604d45f78bd5a087f0a158acf3767b275315b60c77cb4d6b93139943d56ca917a75ed8ed784a608a52d3e1d06cb36a01f5c3d0f5b211dda6d62d36fbe9ffaf9
+DIST genpatches-6.1-131.extras.tar.xz 4056 BLAKE2B add38a1ea9191009b22ce04a556062e419452bedc85d6afd40d6aa3da2474f4719aacf91bc3680b6a08a7b73cd0dbcc5c3249322f8c47660ef36c256e8792bae SHA512 7d68ef7b616ab8bd62db15ead625f0e449b6ebdde8477676d0aa6ef017f9270727413af62985ed8b271aae1f5288682f4fd0d0804f06577e2c1f4014b5402035
 DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B 16a87065f9bef4016c3a19cc4e4ebce8b1dca6b6a165a36f73b5e10737a6df325f2649c609e7cf6489f683c36e52626d21300acad383df486cb866a413416ff7 SHA512 fa57d9fdaedcc5ad31d685fe512cca89f1a8a8fb097001ee069efbcdb9c377000f154c3133757e19cb7d3fe79ae54d996d1720e9eb70ba117f98c935509b3617
 DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B 69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4 SHA512 33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
 DIST genpatches-6.11-13.base.tar.xz 1057764 BLAKE2B af456ba89688ebaf57a0921c3046c4db1d5a83ae5133a5b4721e7521ad72fa2d6d0e44666b22b4b0e3a05c0ee9b45b27a528e8f5e64282d8e48a0f1bf14ac046 SHA512 911558be25d367062afd84df97a3bf01e32fc976c0492c9dbd8010b3ad3d6bc1ec3c14e9d2322bbcb7f7da0eff54e1d0ef0dbb822778e869cf5730602508d433
@@ -78,6 +80,10 @@ DIST gentoo-kernel-6.1.120-1.amd64.gpkg.tar 73011200 BLAKE2B 0e54e4884cc8867cc91
 DIST gentoo-kernel-6.1.120-1.arm64.gpkg.tar 65720320 BLAKE2B 22c63557cdd2aba4f2e5eb1c368da07fe6e8275f591283f43c241a6ee4ec98873a2c0a048deb089f2c95649a7bfe367983d5e15838c1a10f860b7a588b447f29 SHA512 7d923033d78ce9680fa2daf25f919e172f590ecc7637a13b1cf3cd3f29257664c8d3f9bceee272d4b3c8725974df707888431778a14e179ab1eaa1d9c04418c4
 DIST gentoo-kernel-6.1.120-1.ppc64le.gpkg.tar 59924480 BLAKE2B 6e71945a1df9fb9eacdbed4a3c3ca006f04f3688effa0a0f5845fc10fb054cf87f2007dc1274cbcad0e3b624f4a31fd94270580d2328d972d92a66b3ff009b53 SHA512 b1324474179d6dd026ed3b5c55f08786ffb54c9ceed75bfd0a704e8fa40f10cc3fe52cad2c84fd778d2ee3006899b148cdbda37ff2f83cf37e5eca59b3d59f98
 DIST gentoo-kernel-6.1.120-1.x86.gpkg.tar 62341120 BLAKE2B 5de407057bba00650ab3fed0d33510aef497c76920c87d388a803c3f1638a353cd0b2d7a4937fd1e57fb8e4059055212d3afcabaa624f31121e8f3d8df47ac33 SHA512 e833e0c3c88fabedfb49f60f2c53c99f2a90cc8a4be7f35b381c35f9b5670a2be445aa20b660fd73d85abcaeafeaf789627799f15732f4a87ddca62ef959c300
+DIST gentoo-kernel-6.1.121-1.amd64.gpkg.tar 73000960 BLAKE2B 1f3afb7211ba2e8d33ad24fa4fa78601e9eb85462dfc7472d9103fc8aba27b6bdfabc18154331cac99b0d3873e7120ebb06a6f9222520e05332219f596eb3b26 SHA512 f025e9f3804f65a44ef03a779801f20b4d093612999dbaa7e62b0bceca066dfa80ee4ef1affce06f027d87463c4c3a96baf0cff7e10f2322d4fe639b1320d570
+DIST gentoo-kernel-6.1.121-1.arm64.gpkg.tar 65720320 BLAKE2B 3630b20d56044ab9f85f03f32f8a693f8bf39413a6b5c9bbefa722c2fdd30ae5a6026836f0dd55f6ca3df91691190c1e00bfa88fec281e12709069e95bed637a SHA512 14e0811fc866e31a7d9c983bb6477e601a08bf2df1ab7f854f8ec609d68e28e2b66650178536baccc9c491c2948be1606d5806fc5de261fbafd72dfb95469612
+DIST gentoo-kernel-6.1.121-1.ppc64le.gpkg.tar 59914240 BLAKE2B f5a3ec5585b7cb527ffafd5b701a2d022bef7b9d7d8c29cf3902d6f80282209854db5ce1316b3cee11dfc122c5fa44a50ea260fff68c65d80c983f506e8cf70c SHA512 a9cb921ff44f9153d362f6ec25737f21d88e9e1e709ebf933c90da55dedafe424449926be5688ea90c0874c3e2e6ec7352e63e3d963c4bcd6449267d669c02f0
+DIST gentoo-kernel-6.1.121-1.x86.gpkg.tar 62351360 BLAKE2B 9f5d3b3d793455df55647619a27f5672b985b5650208578b93854978222c36e5e2a6680d92e53e400b9b79184235127b85acd9912defe5c531600365591bdb95 SHA512 817360200ed0434080df50b097a62f2ce3947e29393527aa7893dc2a093986c4581f62a0da938ec3dc00ccad32cab5cdd61967a9ada9b76f1de865af9ae9c361
 DIST gentoo-kernel-6.11.10-1.amd64.gpkg.tar 293836800 BLAKE2B ef9074050bfad68bef3b2f28681211e03435bad2b715915726c8194b3606df6470b5ea374b3d9f805727f7d37f943928312cac0938e15cb565a41e7fa9e07362 SHA512 32a132baa3b77e35707f75a00ec49fdde32e67276cc88d0250d238447513c0c58ed6854d32a74ed9ced9f5055ae98d63abda2f7878392d8155fcb4bf876128ce
 DIST gentoo-kernel-6.11.10-1.arm64.gpkg.tar 268933120 BLAKE2B a8ddcfc11544bce82d51efcf4bc5a4ac2fc3bf7b7d6ac7f7c628ec554c440551754f3ba554f306c1ab2532b44032c5581ad7e6e5cdf8ba9aa74e43ab3eb65706 SHA512 d9c28da3e7c7b31173feb02264d85e9638888a2c43ae0e9f98ca4f3283fa2fd3fadbf16eea1b71ca46957f48c7ea3bdfde7ee0cecc52ace91d9d89ef6b4ebbdd
 DIST gentoo-kernel-6.11.10-1.ppc64le.gpkg.tar 72847360 BLAKE2B 18a9bb4314fe95fe52a606f19e95a9ea921d440da6cee009232ae57f7a72f8b9f6d529df50cfff476fa9c94251ce69061d699ec18d5355d28f54ba4a7ab24e9d SHA512 e149abb89d4abd00d7aa9caed0731fd4131e334f4f678ce9aae494358165e0423776c1c292c9549c5d45dadabce01a2ee275f3285d6152a413a26659adaf4d3a

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