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

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

commit:     da77c1b7c46f753d2cccf75fc0288409e76a993e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 17:07:34 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov  8 17:08:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da77c1b7

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 347981d711db..9140c4fa241b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb6
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
 DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8
 DIST genpatches-6.1-68.extras.tar.xz 3816 BLAKE2B 86fce6b028ed4c3b713cddfea42f56adf55e105c9defbb8f6a84bfe397f0163ee9759218c2b43bbe9f9f6838623816fd3c31887e5b05ac8e98235f01f750a4dd SHA512 23550c824e7f3a1507d1e124224f0c1f4b7bd3deb07750d392011d374352ee430acb84e55143f3bbaafb67f9ea28a6aabdee77ffe3a78d68691f30fefd4304cb
+DIST genpatches-6.1-69.base.tar.xz 3845328 BLAKE2B 8712160e24a37b1333b7cb2314cc9a807caab08d2a19a4c784d38f8790bb7d5f8bae06ea3f18e0430bb9d196f5525299f6530661d182769ecf5e77cc28bfc852 SHA512 bb88322d976e4dbabb9f884e6eb6a4d581c409fe7d249b80bc4ab87945cce579878c0b197db16b1543576eb1580ba46586b077ec6294647fcff083d26268d889
+DIST genpatches-6.1-69.extras.tar.xz 3816 BLAKE2B beff365f70a79f0b89ffaf3807f69e770a2bc05baf568b80dff66d135d59557bb0463d2c914953722b0511a2e1b100b0c4b6181192b3ad42eb4f592c0b785eea SHA512 9fbf140b90103a750287f4ac94b3f1606a5f12d97626dbb8370b876e1894d5397f4af740885b07dd5c4e0616583f6c909bc881b9cd90c05cf1fef614a006a6bc
 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083
 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85
 DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
@@ -68,6 +70,10 @@ DIST gentoo-kernel-6.1.61-1.amd64.gpkg.tar 72550400 BLAKE2B 76991287a439c0badfcd
 DIST gentoo-kernel-6.1.61-1.arm64.gpkg.tar 65576960 BLAKE2B f1f10277e976c3643be5fa8e834ea7a9defee191984a0fdb2d5fc9b592c40e7e597a98b19c0948f26c30ff129bcfbfea85a09ea26c384c85454022cf6482c202 SHA512 031b405d4342ed4ef7d00fb94cd38d0afb3f7a0ace156b52b4c87241f6e1802b0befbb4790026c5e981d9e661fc257b3eb7eca7ed3db8e746a513394d80b6656
 DIST gentoo-kernel-6.1.61-1.ppc64le.gpkg.tar 59852800 BLAKE2B ec8d57bfd304e65b57e78332fc89ff1d4333f35c27beb52d1acbcbfafe3066b791302f7ca1f92d2c51f4ee6387e0d5a414eedd266fb0d6517d6c116046bf7593 SHA512 ac93acded9264150d228ed84f4594096f1ea23e9fd83fce744f7f92bea225887945f1a1349053a1ced83e240b95d80ca5a81e376586e343a033cb4ff6eac80e9
 DIST gentoo-kernel-6.1.61-1.x86.gpkg.tar 62115840 BLAKE2B 8db48c54d9b9dbd15b6b7104a687083e954346456d74544af4653d297274cfa14fcfbac5279b07a0cef9296e31a23870b8e15fe1b89d308ebbe77394200aa230 SHA512 7d84d461ad9215cd54789a8258c291cb99361c4d991e7ff57e42b802f1966f918c1ed94e070f4078eb577b831d03c103e29251003a64fe9891d34b266a82954c
+DIST gentoo-kernel-6.1.62-1.amd64.gpkg.tar 72570880 BLAKE2B fffbda5d72cfef3e3e392e030a0b2e61337ff1f36565adc1a79c103ed2104e607ce81aedcc28276e3677aaa06fbfe3dfad6820654b1304214f22ce01616b184b SHA512 9e8507e22dd4623971e2add2a9866f382d82fef29fcc257a4eb9999dba8cd6a6d21aecc8498bddd0ec9e68ed62d3c923358c766bcc05c0a2862ea21b841df935
+DIST gentoo-kernel-6.1.62-1.arm64.gpkg.tar 65576960 BLAKE2B 37c05f04c698e50123dca234cf8a31ecbb48ccb4460ecea58fb0d95039a501fb32f0bc46e78b00608b734f2225861e430067a9c089c267bd608d34cb68320167 SHA512 880e5cc31f37b84e57ff12ef0943eb60643111b62479023b6c9cfa808e8393d6514fc06910f807aafc4b66ea0d38b2540dd1b8c66740fd9ad737f92e3a20e5fb
+DIST gentoo-kernel-6.1.62-1.ppc64le.gpkg.tar 59852800 BLAKE2B ec0b5ce2c745fc780fc30145b7fe34a0cda921f5d84d47b5154dba169db132a6b8a65ec44419012d2bb038f4f07e097dd2e813a24b34edc7e031eae69f222b2f SHA512 86d40fd4b0ded900bc390e6210ed5bcca044d5dacb3f7a269793028187dceb2ddf4731ed893dddc86f0dbe03a54156f1bf4414b665628914b56b8e9e9e0352a9
+DIST gentoo-kernel-6.1.62-1.x86.gpkg.tar 62095360 BLAKE2B 512b11c378306df3297d708e18d23effeadc3eeea03787afdf4fac07e1236d1c0cd0b2d82c39e9d26afc2600287ac9e592cc5378ff04fa22c8c1cd55dda55ab3 SHA512 8133a1d6e5022a34e67ed067e850771636e504cb3275f9c0a00bd9483fcfdaa513c4ea6166d2742be5ffc8f179047d983a6c05c7df741cf53db16cb47b0720aa
 DIST gentoo-kernel-6.5.10-1.amd64.gpkg.tar 83722240 BLAKE2B cc31076b25edf689f7976a679fc5fdfb25d7f21c18562f32c47bb2d852b922dc50a4ab5d813725fdb64e2d06ab55ea22643cde733fac0d9379ed58b187a3d93b SHA512 7d689b10af6b471048e172be41d090e35774ba9b7cab5fd79cda489cd6224b47b16497cb73f840cdd4de8577096b734abddcc89f990f32d17473968a326db0fc
 DIST gentoo-kernel-6.5.10-1.arm64.gpkg.tar 73635840 BLAKE2B d7b0dd04cfed53281d679e6687d581d0d12c9096da1d36ecdbc38f83287a18b55bfa335fb8dabb623bb356df76321a61db147aa2a499a40072adffa210bc0a25 SHA512 ec9b958d660768dabdd26c633ed39b37f6264231849f7bd86d65a60938f496f69b0cb2cb1afe9d3a95987b8ca5c495507f5ca9d6e6df9f95ac87ccf46e0bd914
 DIST gentoo-kernel-6.5.10-1.ppc64le.gpkg.tar 64532480 BLAKE2B 5c6e81f5ee141dd958671aca5aaa10314198b3fc38d025f36263c1d1086e09b723b3c96688c2175ffc94f8e3a93316a47b2b8d185499e6fea31a9aeb36fce24c SHA512 ababeaa3f298d5503c6db664c67fbc73e32e0efca4cf14c00399808e86c0a3346b6304eb36264541d5a9ccc7e84091f63348d296442c09abce8f74951e360d55

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.62.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.62.ebuild
new file mode 100644
index 000000000000..d2845437114c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.62.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##*.} + 7 ))
+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
+}