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

["Sam James" <sam@gentoo.org>]

commit:     bcff4516d7b70d68080adbaea00b6d7481aab74a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 04:11:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 04:11:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcff4516

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

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.68.ebuild                | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1b48f2622a21..5a4ab8b3c4c7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.1-74.base.tar.xz 4113880 BLAKE2B 26d9abc23f66346e376b78bb687ae
 DIST genpatches-6.1-74.extras.tar.xz 3812 BLAKE2B 52488fe7154cf6e0153a05184699dd1597a078a7a376e2866b68b923e7f82300757d1c70e7bc44920ab7813d500fb3d4677d49428261308e4b6b59a552381a9f SHA512 dd04bf075792824bf65cf349f6bc921d0c36cc66c878b8dfdd95c27f3a82de426d6725d79c02374e7372b74b68b9c0123875476de434f85646dd9aa8382d8de9
 DIST genpatches-6.1-75.base.tar.xz 4114396 BLAKE2B c21211d430392fbe96b0616e0ece650736f7204066222f88b84cffdbedcbda78d8fbf30ce8dce4c7fa450f24410fba1af1929ee3b3ea0472fde3473db95a0f5c SHA512 106db04baa9ef92e324929d025bb68f9eab4d0144d12a3d11cbfffb018cc46abeaadc76240c1acfd3877ef8efc1992374ad15cca061258e5f20452e3cb71b90f
 DIST genpatches-6.1-75.extras.tar.xz 3816 BLAKE2B 6e34ca62609c5ce63e7accb16f0c295bf9a38602d0c11af80c81f12744c0d90aadad86164b83a362dfdf70301ecd879eb67066544dbcdfd522d767e103a8592b SHA512 05718354716e8c8a4bbbe94923201345e2d2e75274973114878d46bc34ac2dba4d7d5beea333b4823efbbef65449bad615733c0ad0c6ffc6e1b2595ce0e45d38
+DIST genpatches-6.1-76.base.tar.xz 4170836 BLAKE2B 5f3d0f64b1b884d8401076e752e27f2021dbe9fd729172d5ae75ed8cd9cf578585e7dfcadf24542a07d4abc8350dcd0d17d41521f94f8d9d5bc1858e00752f5f SHA512 d4fa7598e022029d80199cf3c236b92c168674111f9d5a07fd3f8ba8db76249578db47ed68c412de369165d5c12c88510556241002285287cadd9a3e4a7b12e9
+DIST genpatches-6.1-76.extras.tar.xz 3816 BLAKE2B d61edb2c2fb7ef815aca59eee532177c0452ccfb5896398200d704129e40daee6870b11c4758095fb6824eb015de46ac388cd77ec075e1d508c8a299bd4077a7 SHA512 9f90fc444beef2fcedae8fa2f6bb01492c9ff3fbf2a5f34cc17a52e5af9615538a6a24eedfc4e09575a03c67b339c4d964ac55e950b6aef11935d5f877862ca1
 DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd SHA512 6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
 DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B 1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107 SHA512 6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
 DIST genpatches-6.6-8.base.tar.xz 472816 BLAKE2B 503418967edebb8cb2020edab16f060334fc16c9f6ce7980b8e25e3db1fc4869571fd466abc8ec4add3a095d089f0c77532b2524fae1136c5f7ed487e90ccd3c SHA512 04a247aadefd43a9ec1382b5f77f18dabb1701469cbeabcaa1604405cea9112bec56bc9a08d33f9ce5ebb90b8d77a7c7a21774a10906f3c8a685c0d3c10bbe9d
@@ -28,6 +30,10 @@ DIST gentoo-kernel-6.1.67-1.amd64.gpkg.tar 72632320 BLAKE2B f078e2b5faa96eb66893
 DIST gentoo-kernel-6.1.67-1.arm64.gpkg.tar 65597440 BLAKE2B 75504780716018f8205a0e319587bd1e9f97583f34234b5264d9984bf4abb6b640e5e1369c667d311ffc7e3c00b0565c40c363a6c987acdbb613ba3ec1c1b19e SHA512 4ac9d5cbc35d2e1846bf2b1909306ba26dedbb5ed08f9b1659a1a9ab572e1565af69d6a7e61b38047071fb80b669d45d3de3149fee8d85a2afd3a30ec2daa82b
 DIST gentoo-kernel-6.1.67-1.ppc64le.gpkg.tar 59842560 BLAKE2B d73a41190a74047a66dad9bfcb519893f5946fc0354ed4d0325d6b5c85f464ac33e3df3d776e1b9923aa55223c918015a287fd1ae9807af20a5fbfde31f1a223 SHA512 c20c7eb7d69602c605615dffd16c22ec90ab8049eff36d56d8a178953e98f97beccbe7babd2c1f42251750f92d0472826f3812579bc0cd639c8d6d7451c6e574
 DIST gentoo-kernel-6.1.67-1.x86.gpkg.tar 62146560 BLAKE2B 0fcde449825da31afb3ad937c71551b78c52c438fc4832ccbd00c2acb7d27fb8c21a27b58c58b69bfd445bcf0da11400925d68009acff28ca99d38c06c741233 SHA512 286779c51104da8bf037e1fddbe5084ba348f116db782e35f7f817958b89c09c3c2fcdabdd6657e12b7d7adc3bd31aff54647b518d3eb73b6fc8900274cf51bc
+DIST gentoo-kernel-6.1.68-1.amd64.gpkg.tar 72591360 BLAKE2B 5b1e97e4277883d691856d7c8afedc216768426061612fd3b42a66df022a30e42c877e7ed1f7f232f5edc1df9a5bea90291906e3aeaad265dff7052074944706 SHA512 8f4a24df88b58980ee9840780366140cb0ae7e18d64edcf9cd497fd7ba7923692bc3475dff146163cf0846cbc5aaa3d9f3645c035737c465ee510ccfb05e5b05
+DIST gentoo-kernel-6.1.68-1.arm64.gpkg.tar 65617920 BLAKE2B c13510d3e2cc57dca9d2b58378731bce70e33dc6bf0b2a0492259448080ba8c790cf49d873a91aa82d5612e27ff40fdb3605096f45e69d6db48ea8284a54cf3e SHA512 35aa4cce38ffbe83e51995fcf38184174edaea40a2223f3f725972ae8f17a64509090dfd9541339a06c114c4a5646199d565de0b3c3ceb53f575e3550ef2de76
+DIST gentoo-kernel-6.1.68-1.ppc64le.gpkg.tar 59873280 BLAKE2B 386808ed5ce96c5a009c9343750b28dfb3a76355a9bfde8d25abb90190456072f78f8b9ed6e7b6caf670ff79f8600cd70e09927285d8f4225373a36c88f37a8c SHA512 a4c6d700cf41a51a0edfcd68fe6e3bd26dc0fb7f55d54db9816cf9ceaeb6bd46fb33f141e5c7783c5af5175df924d2125ec1c7ed40df3d66be76ca5760fc7987
+DIST gentoo-kernel-6.1.68-1.x86.gpkg.tar 62136320 BLAKE2B 793f1b4718835ad0c76d7ec7ea1a9703221642e7fc35bd592b5df4a0441eee132b4b9a40dc1eada963daf9e9288747051b536aa1b9e768f7f5afac88e727e446 SHA512 1291804c18143bbb39535be7c171f982da088f4ffd831c438acd5443923d7e3eca9d0e1fcf7cbb1a9a1a10d54a7910a8b990ca97336c1a19d63bf0477489e16d
 DIST gentoo-kernel-6.6.5-1.amd64.gpkg.tar 84510720 BLAKE2B c2e532d30dd0c248fbb09238ee45d4a736e7495fba0ffd1f75898a613ebc53fd83f8d20703570b27c5fa2a79b0e5be56cb2c2abc93d4630ed150910d4f4392e7 SHA512 788e2a74eefee4f48a71426d3b01ab5c2e3572a260c5c4a32f07f29266d789e1aa4af535e4a8b13ca0337ad38903a8f2148bc72786070eacec053c5efe80cf3d
 DIST gentoo-kernel-6.6.5-1.arm64.gpkg.tar 74332160 BLAKE2B d486a15c14a396cfcfb276aba8f3ba047594379828ffe9cc4804bbb20c8bf0db46da08fe82216efcc63803ca460336388fc90085f9b82a4ab40d8cb25a394f50 SHA512 6b4e381dfc9bb51ef870d03bf1ef86a2543b52359bfcb66b47f1fa21785a0d522e177b5e9abe711286e8634aae95cee7589d3069a132144d49bcfd4f6d1d4f07
 DIST gentoo-kernel-6.6.5-1.ppc64le.gpkg.tar 64337920 BLAKE2B 24ca829e20217cbbef416658003f8a100ff3b0a836baa331dc363a8822ac34b47812f3966055eee0b58d2d3af2a1217eba86e3a97e2c5f4f5b24e3b940823b40 SHA512 d285158b0d57427f23ca15ccdbd7affa9a34dd03daac665f3508cce11b3c59f9e9c4c933310fa5faafa5c65713a598c2f596a56294c31d73a49f23de02845e43

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.68.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.68.ebuild
new file mode 100644
index 000000000000..726e0ef534f8
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.68.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 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##*.} + 8 ))
+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="
+	sys-devel/bc
+	sys-devel/flex
+	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() {
+	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
+}