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

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

commit:     8b422b64a08d6f8eceafef951548873b5c18973d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 20:19:45 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:20:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b422b64

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 2a1694b2e623..88bba9e2d2fe 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-75.base.tar.xz 4114396 BLAKE2B c21211d430392fbe96b0616e0ece6
 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.1-77.base.tar.xz 4198960 BLAKE2B 9c6921ca87ec2c3338107a994d6e094c6bf4ca5a705f21b3efa2803454327782ccf2cefa78b2a1bfa59413402d5d89b757a5522b86943c8c8c5d97592138758a SHA512 34daab45df35b30a5bc155aa82b074f6516bb1af7b2976590f88d88e25f6e8ae369fd1299f7e2f645c045b29d6b805dd07291ab45c212a9aa27df566dd6aca96
+DIST genpatches-6.1-77.extras.tar.xz 3816 BLAKE2B 2129b36991f127c4bb4783a535a2d58bbe8ba9f4f139f7b70bf41a1c54bc2ac9026cdf3e3662f47c28118844ff40b6ad1c8da1c5fa8f1f4edc768fa69cae2083 SHA512 1de0ce45d9a0a1555faa92842f884cbaed8f5e727e4e59cbafc31326c9a183acc4954b2cdba1bec2019466545870ead8b5300f419533e30386aa2a36f6606a9a
 DIST genpatches-6.6-10.base.tar.xz 603340 BLAKE2B cc3220f1df9406c393605942e1a6fdaaf8ab46da53bc2fe6d001c9608a55ae2e5073d94805eb233183142e81bcea9bab1ed4700e298fc32c16c033597219f9ad SHA512 1f0149759b98fa099bda28aa1c4913719f0b5c0c715a72f6c0b13d3faf317a8935ce10508cd3459c50e39a7759feb44e7cf43fd49b87bd5ccd6d42a5dfc531d1
 DIST genpatches-6.6-10.extras.tar.xz 3704 BLAKE2B 8b5e1453dd7bbbb7ee6dd02aef5e25e95f09a12a46d9dc014d71fe8fda96b94770f3cee75fa6f1db6bc9bdb67b39d272f8f887fc2986a17769237768bf6a382f SHA512 6ca7a360dc217684b1a06f869223a52772f267d48088d5e286dd27056faf34e9c4b4d575aa771c5f9b972febd4c656e32f470c4499feecd47716b07cc13ab933
 DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd SHA512 6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
@@ -48,6 +50,10 @@ DIST gentoo-kernel-6.1.68-1.amd64.gpkg.tar 72591360 BLAKE2B 5b1e97e4277883d69185
 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.1.69-1.amd64.gpkg.tar 72601600 BLAKE2B 3213eafb8fc9a2118a97db6b4647919f1c5d6def76173b948fbec00a3f5c081eca0098fa2d539920c19ced4490973457e51a0f8288dd26e0bf337e4307e77c9c SHA512 182aa3a947f41ab203d47b1d382bdcbc60536add91d504c634a07152689bd4d7f95baf91c348a4355a661a11fa5e98d009c2343b8365257ae3e2f53a522e6743
+DIST gentoo-kernel-6.1.69-1.arm64.gpkg.tar 65607680 BLAKE2B d3f19ffcdfa1c9fa5d938e7dccd23bbb7d6b139a662ab00c8e890a177cf87400612bcb287653153a42b5088116ee58ebfb1ab6c6f490ee6da0aa36fe316a78f2 SHA512 1f1fd6ffa7b0d6ddb75b7576f0263e0268c4e4c4c74f1dd12e6303657c5b2320f821d63359fa2268cbdee5435e4cd4b5fc9814cd5d990046027fae8846577ac6
+DIST gentoo-kernel-6.1.69-1.ppc64le.gpkg.tar 59863040 BLAKE2B 151afb62e5fc5b14e5ea1eb87e9fc2161bac9e0c02f3e39c2072a76e05b84fa046489a7e4c1915ac6db53f43872f25fb4b7b2a425bc990b393b845db78f55be7 SHA512 89014298eee186e94776a812ed83a7a0495b0d595f94b74d48f3bf62b91756e643d16ef40c665b77514a0a8c3056e3855130e3b63b5b9d3a530e6eeb4244a7bf
+DIST gentoo-kernel-6.1.69-1.x86.gpkg.tar 62126080 BLAKE2B 9ada4a79c8f722b4f464d0917aca8bb4f6073d941668ba21ddc89500fe91edb89d7c14358c6b1c583083c73d386cf7bfa6254d5d589c385a0a6d57cfac01cf1e SHA512 9609ad6c536694caf696918971645393f22758d34c11e42211a8074d158a3dccff74a5755357aa607fecf58463cf98649cbb77dc125498450f46aecb5382dc5d
 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.69.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.69.ebuild
new file mode 100644
index 000000000000..726e0ef534f8
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.69.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
+}