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

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

commit:     eb82c061e8da866bf5108e672ad113a7f3b211c1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:49:05 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 16:15:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb82c061

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 183564213db3..3f8b15d02a68 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-108.base.tar.xz 5541376 BLAKE2B 59ef9110b100cf6064c6c6e556be
 DIST genpatches-6.1-108.extras.tar.xz 4052 BLAKE2B b6ad898a5a66a1a6ef293bc4a4a886ea29f0a1f985b3b85beec7c4e935e90ac9f642e7811261e413cc39b5a0ae36fd257d0afeb4a9c52aa29956070b4b52c50e SHA512 6fbabfbcd35db0dd77da03c138a6a225f7255cc3566007368ee759ce154f23f11edb8434be82992f153deab19c6b5549d00a7cfd54c4d0e49eaf2e4d39b86597
 DIST genpatches-6.1-109.base.tar.xz 5540948 BLAKE2B b6fdb5f6641ca8617c976f69bb731147ae1d1d24f1da6686ac8cc2a1a9775c2a3c890c24609042617b9397a9abdf9abd6806fa5933e215de1dad6d0f67277a5e SHA512 e2f0837a9b5588df44a1936dc5dce2c1aeddf1d56795600513aa22a08195da4c358935e7d347ec09d4d25aa5db6c5a036e7a718bfc442796c4994736c6dc4daa
 DIST genpatches-6.1-109.extras.tar.xz 4052 BLAKE2B 562d5137c87031ff9f43b4d081b26b35cf4bd3c5fe074ee826edc8ece2ed074eeecf55c8914ca728267a9f78d907a51354c3688186d442d9fc02340224a0c71e SHA512 0370a5cfd83a1c87828396e49f003b29fc68dea1568f6de417fe488aaf045e349f0b84695f3643ad9811b4f57ef31237ffb9a97c72294139aba94557e1f67a18
+DIST genpatches-6.1-110.base.tar.xz 5564556 BLAKE2B f479e7fc7a12222c9b0268825fc8200e5bc3d73b81cd2d5b64bd321bc66b4563ae17d2bb66a0b0610dbac3059564b856d16c6ee122ed51a4c72d18795575ea65 SHA512 a0e8beec29ec7c63fbad02d13acf561ae694847d482f34a9120a06692aa4df1440433b19027484d3ef6a50221411bf34d175a4c833cda56aac4578da8b0b67d5
+DIST genpatches-6.1-110.extras.tar.xz 4052 BLAKE2B aeded3974b119221fe8546f59eaa9a89842b24c0dd7d1ea45be003dbf91a62194b04d01e9811abb4a4af21b0e7b77e35b521a94f6042954f6fc09958fb41a84b SHA512 729ba854dc3513d9149860015013ea8e539bbe6adca5a28c53184fe0cb722307e96998c26dc1966e25d232e19e3188daf4adece4692d2804132ef956267629ee
 DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111 SHA512 6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37
 DIST genpatches-6.6-42.extras.tar.xz 4048 BLAKE2B 0d86f11ef43c33b1014423a4417be73e4ace2eb5d9c38c7a63e8bc424eff7399137239138de1b89a70247f1b174766c9672cb05743aeaa14ea66d8bab67593bc SHA512 5d264209a734c4cbc48dab228b7d8570b735748b1c01f80beb2803dca3027ed78303ff937aecb1d8e3e6f2e2d4722aa0c1b5c77a4d45f2a9c53cfe1c0ac0affd
 DIST genpatches-6.6-44.base.tar.xz 2571884 BLAKE2B 117eb333385bbff1ec4056dc9fd7374260a33f243fe20462b914eee658a57b90e9115e9edbf5c8935890ddcfb233eaf88b3e0062245cb838953749c8bc674376 SHA512 e8bad736c8566bbdc081600305a4014301e4f6f74b73ee68efd818fb92e2d49bdbf0b7a2b66c5cd5aa8e56e7d183aa03c2a02e7328ba7e0c71fa1646e6868cc3
@@ -48,6 +50,10 @@ DIST gentoo-kernel-5.15.162-1.amd64.gpkg.tar 66385920 BLAKE2B 24ab856cd827b2f47a
 DIST gentoo-kernel-5.15.162-1.arm64.gpkg.tar 59750400 BLAKE2B d96929525808d0e4df1ade8436b5c666613b710df8c20e19f8dfa6495ddc98f8bc1148ed60c952558c779e9cb1ef8875a4a0928381dab7c970837433a8ea83fa SHA512 710a018b38c9d5b752eae1fc72a6b43db220a05e7f5246cfd32238b054ec17d87e5938891dd191c1d691605e7adcca9005f3cb51872ca7f9d47e91e70307d292
 DIST gentoo-kernel-5.15.162-1.ppc64le.gpkg.tar 54988800 BLAKE2B ef71d77de36370a77bbd097e15c052b0337e143b3c297074c30ad899cd68f5f15b17fa2ce91a8c635d942a1218e5db15613ec989ec4ce09d85f5771a351a48a8 SHA512 8ea8b185c59a7ab0dd9ee7678249020ea3406c8b17657801ccd83aeba890831983f83f91fa6072163a825bdab50c283c38d01a3df4723271be5301519cd0c6ab
 DIST gentoo-kernel-5.15.162-1.x86.gpkg.tar 56176640 BLAKE2B f6e3a140fbbfc8d269deaf6faa909244473e2e806ee8b976688689fa9474917a1885d40dc30cf0a44b2003f10fce3244c8b72fdb2df8a07183669c78c8f24df9 SHA512 793582e677c9604aa8e377e263acf5421e60578ee818581685a6adeee1374da80462d8b6c6cd8f73f8d06e220a5f53a12727b592718abd882181fcdcb23e71ac
+DIST gentoo-kernel-6.1.100-1.amd64.gpkg.tar 72570880 BLAKE2B e8aa0a2f5455fb70693272439f554ce6453723272b2b108f65f786ee0b2560fe6319d4952a3f71f35fd9b3eb2651e0901aab519ccbce0f5206d39be143975bb2 SHA512 872372d78774278695c1b7c2df6847576fa80f7e90c1a2e8c5d06318270cbca9f1a4715698bf70dbe533f16719f7565c287ba8cb32a478297544e4bed690560b
+DIST gentoo-kernel-6.1.100-1.arm64.gpkg.tar 65546240 BLAKE2B 2e673badd76cdb6dbb2cd5e4a2ba6b8848db477cf5d4f46dcde791c3b8fce1920632ba1309cfad2a5a8353e208f0eb5ed6a58d830a72ce3b6d3ff9ab25eaa467 SHA512 a18c5a2b3d37709307f6c4be17fbc8d8944764cec54197d61ba9bf2883b61324ccc0d2d3064ced624b6522c60feb22bd78ee514c9df626608af7fbb845f7870a
+DIST gentoo-kernel-6.1.100-1.ppc64le.gpkg.tar 59791360 BLAKE2B 485d690f30beeb3ea27b62da14fbf20bf5977df6b23b69dda6b5fe9ab6939988bc592be94e5d5ade7bb1c86d249b1aae0a2cdb25e2b38bf74c48cb8a1135bc1e SHA512 b70e509f8fabbe843fdf6865524bd6cc325bb7ddd165c80672ff6f435880dd8455ba2ca59ff626df99431d18c496537127de930af50a4e97e02eb4f89690bbe9
+DIST gentoo-kernel-6.1.100-1.x86.gpkg.tar 62136320 BLAKE2B d2b814fae665d38034a02a89b736ad366e4797fdb31410e32849abe352d189728659742bd8805718028cb6931772675bbf0ad23ca2831d8f64f7e2d37c5b843d SHA512 05d5c42cddb8506509ec664f49e170ec47918aace2160ed45aef5157795c38460e6c956314d03bb0ebc2e7dd4e0ecc0d924f4f6d945169580cc1d235bca22661
 DIST gentoo-kernel-6.1.95-1.amd64.gpkg.tar 72560640 BLAKE2B 67e26e89e23205c77aca089d6e93a7144e681ab5a71ede7119bafba2f2b0267e9f73ec2a9d244fe560ed5f7ea37159dd5e4d63bf5cce84e61eb9ba9c3e8e7632 SHA512 44091394b9369e8f64985f55fb7497212896d66d267f4ad92352d097b520271aca229df3a1feecb6a5568d1bb08d98563758f3d656768b0856b8e47de92372c1
 DIST gentoo-kernel-6.1.95-1.arm64.gpkg.tar 65536000 BLAKE2B f6aefc6963310a5d40b9efc3eb8cb05cec28a285113f1bff26149ad4454aa86636c82f59c6cb2937aed1118c8e8407d1477d9ba471dbe49df9bbb884f395e79a SHA512 545b705a6068606db1c8bf1d31cc4ca80e8b522a2ebf121f414a519145bc97e94af1b340bc8a3a9b527137e2e55a058fc572cb2005836b27ce32573eb3243339
 DIST gentoo-kernel-6.1.95-1.ppc64le.gpkg.tar 59791360 BLAKE2B d21ec9b8e44b7291e17b6766afea3cde882470ce89e6ab4565d967614750b2b55ea2c1bb5752aa42d8b66e361a9b1ebb4a91392cfc614b0764589409c3d35f19 SHA512 18a172b9c817a45b425fbb037b8128445ef3e08ba49e82f04a212962a8f0f491c4a3923c6f45d810c407d8171dff2a19e409320130cec1a9805fb837fd66d143

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild
new file mode 100644
index 000000000000..81911930d7d6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.100.ebuild
@@ -0,0 +1,132 @@
+# 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 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)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# 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
+}