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

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

commit:     fefd9b24cbdb6793e46895ba91a599949b92190b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 11:22:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 11:27:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefd9b24

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index c2da6fcf3b3d..967c2a2a5426 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.15-141.base.tar.xz 5572792 BLAKE2B e062086d50d08b67c21c785b086
 DIST genpatches-5.15-141.extras.tar.xz 3936 BLAKE2B c51e1f9dcf3995a2e178d8763407dc94595e513f02d96d54dc1b71a34ada0eaf46b6cb1cf4bebd39b4776605532df529cf8ed361480181af516ab889f915ee5b SHA512 5eb1f68368de87df9236bcf10726cd3abcb75a9f59579e9810b9ea53f3ad332d345a3da7c1be61826b6b739aabb11a838d12ba7be3ce2cb890e094433176b02b
 DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B 10f4366a8fe83ca0609c0e2654e6c64ad47f3a3f1744ca637d8801ec9c8a8c541d74e21e020de0a6de18c98de640810d6934092b2b983b332e92514c2b6443a7 SHA512 1dda1ba93fea4c18ecaae6ec5a3cfea1fbe7f89fa9412e793b7cd0beff43894650167c77d1b85eb280f7754c85179dc3c72e32ca18f4d8a95667501c61958656
 DIST genpatches-6.1-64.extras.tar.xz 3816 BLAKE2B 315826af9d3e7abbef0314f962e2df50f9d183555ec5fb956fa7c9820435042e3c3a72a5ad766a3441543c54986ffbfdae8ff0a4deecb2a72851237108eaee71 SHA512 5a384aa4f6aff1a3410090873f9321ca1c6bcdb48dfefeaf7c2746b950ad22c7a745c60389ec49b99a249cb62c91d517389d5d91c844509dce5cd45a67b47edb
+DIST genpatches-6.1-65.base.tar.xz 3729228 BLAKE2B e2f41ebb95ca74bc5d37f950e088d2d790c09613728d86a58c31867954748d5ce57f484acfde262bb70c2d42538241b6b05cb9befd7efd6ee10a276fa79e4c3b SHA512 815a57b87978d2a0196146ff4e2ff6a7e95d10c74727d458f9cbaeddded3c99c78a24524b8cf1fa0f1297e5bc7f3c9cd743b19f12938478f3f3faa3a68c7e431
+DIST genpatches-6.1-65.extras.tar.xz 3816 BLAKE2B 78f99a28e607a207731a34036931d663c1815ba00bbbf0d83dcac5597733b705f2239baf44b1b454da38303c7b9b4663c8de9024f7bb51d71f155d5b3d948cb5 SHA512 e228dde9f67ff74e02dfeac5ddea5f2f0122f4a7f09a6499ff8ee27ca1eafbdfbf09a756fac212de49702f01bcef8e25be1872c62986d393aa55cc7274d906a4
 DIST genpatches-6.5-9.base.tar.xz 574412 BLAKE2B 339dc1d19a323c2143fdd394b324e8d73b6e21b833e48096b6ae312b188bd9f39811fcd7b93f900c6ceb6982eb6ca108b2ec617b8dc98fe2ec255ec3b002e31a SHA512 42873d29784c0d85434d7eee81ef2000a42164e20ef74c875b81ed8df96ec3632261485c38e17ffa41d94df200b69d8d0e663eb8c90ea741234e860aad9026e3
 DIST genpatches-6.5-9.extras.tar.xz 3704 BLAKE2B f45e43b281c9ad49870e72a7d4e3790f316076f438a5b45fbc53bf3fc29173675fae1e1b8ec170aa7609e0a87e79afbe033ffe7ee64d1ebdf2c1200fcdcbebca SHA512 888a87e165c64ee71b04b6f103666b4f699f790aadb58314253f63e82b0c245646f29fc3f139da2eb6a08db7c8f40c5239a359e81e3d7ff2b0d60b219f8756a8
 DIST gentoo-kernel-5.10.198-1.amd64.gpkg.tar 63139840 BLAKE2B ef7840035ca70fa40147551529e6fea01ec8a0a21b20d92eee53d38f65543c29dea9a1425680becb4944eed2cebc8404baa2d4463e0cd543358e015c10b17ccd SHA512 f5ce69bb2ed049a155b02e0ee6605fb6c62b91f9edb62e1a673a3b12a4d33f6e5ea7ef5e068b6fc909b1480dacfb5c32658be99ac591d6cd4c75a23ea20ee872
@@ -18,6 +20,10 @@ DIST gentoo-kernel-6.1.57-1.amd64.gpkg.tar 72437760 BLAKE2B 40c1640468f10bfd24c6
 DIST gentoo-kernel-6.1.57-1.arm64.gpkg.tar 65402880 BLAKE2B 7c373e287dcbbec86b82b1a225fe8971347708b5c161d266687033bd92e7a331238ec4f6164f18fe69f7138a9021e9c3e831800ea031da29ea8ebde0591a26c8 SHA512 f0ccb7b47f4fc9d86bc540ee754c42db0639710a366a309b448b8b99b4e4aa96a5fe569f412b9b30b51d4ac231b5a97ae7420cf6efbce87ef6190eb9a062d065
 DIST gentoo-kernel-6.1.57-1.ppc64le.gpkg.tar 59770880 BLAKE2B b75ef8425ba37ae13d63842535b4477712f96202cdb3898df214a70e436cda0e4a96405a7a1a0ec40a20ed5df976bfa64638af1b0a7eb13ec2133280dd46222b SHA512 60c8ec52d2260144cb8332de2f23d1ec2499fb365e9616fce6f9a8612b4492c670cf4279d69d6d999c223db9e7b9074073b33768d568182a92e84f62bae9a888
 DIST gentoo-kernel-6.1.57-1.x86.gpkg.tar 61911040 BLAKE2B efe74805e01fb52c45c47b32d3f140af0b6f7c063883dc1af1a20dd2c759ce3267e227489ef278a65f9480ab75e63fcdb873f8c415fb459269a0c04451469d72 SHA512 41a4651dd11dd4ad9970656c246768f319c27023e19035d12af6360886184f9d6ed4ebbd21a535cd559b25e226f927d2d04dff9a4e82bc4de3debb67ab18e1a3
+DIST gentoo-kernel-6.1.58-1.amd64.gpkg.tar 72437760 BLAKE2B 662048de9aef0751618dadee440162f1636b6f616458b560c88e369035d0c35abb45e6053e2d4c48ca2f7b28f939e708c62a994805f1ed8ee450484099b990e1 SHA512 7bd642812c4fbcd6c57b6d9b2b8f0b07e88d5e5e91e5bc685e0b64596b3431b09fa73d63454fd47253315f2c39e9d77f5a95012f427e87d51d9edd9639026237
+DIST gentoo-kernel-6.1.58-1.arm64.gpkg.tar 65413120 BLAKE2B 6967c9828e3e1fc939fb205d81a086fd760e824b34362834be8c90106c81331a75fcaf7470d22d316b1ee95b5ad12969383e4b56dbb607ba80ba6885b3afc43d SHA512 dc23e02e7c737d87a532c120a5bce9da7ef852c83f72897835362c422f2b6adc1f8d6dede2c35eb854974d83f681dd34194575333d8df88ccc2d8733a6349818
+DIST gentoo-kernel-6.1.58-1.ppc64le.gpkg.tar 59760640 BLAKE2B 9e48e35f83b3cb0ee3136f1dfc9d2d1a08335cde4be3537de1ed727ed22e8f23ea12ac869bf5f30ac5ebcb679f5e384e114a3f6c2d04873c408ce80623186dea SHA512 ec360285463651a63fb8b0524b685ac8235ed1480f5c96ae0fbbd1646e3114f307f5b87846befd146116796d050968b734ff128d184a8319eb4c9f0659eb0782
+DIST gentoo-kernel-6.1.58-1.x86.gpkg.tar 61931520 BLAKE2B 72b223b0eb8fcdf160b08e7d66d6b0237fb1b1f1794edeb0ac87e44c7fbbc79730060f56d0d51ff5829d177b5a9fd535e1e6b9ae261c435fa7e2622e052d584e SHA512 21fa3cc2ff3e0cbd7ee70d1d24e08061afe2bfc99d49d4fcd02333fa412d6f67dc0ed2c6a11402b2c7bb0c83fa22042dbc8c3c031728595dac42a7d5debec31e
 DIST gentoo-kernel-6.5.7-1.amd64.gpkg.tar 83537920 BLAKE2B 90f9ab1b3214bfbfbad8450488c52e60d2534f9ff4eafcaf5d3c219b2d48b39590c3b5456ee10db41038cf0cab6d6468b4e8c53f714098d1611511ff5ee1cf69 SHA512 0ca65fb868f87843fab41942d7783a385151adf2ef203b17a9ae7753f85392812588cde1481b86febffe371ba71d0e6482cfdda12b0d4dc607025375a1db0e4a
 DIST gentoo-kernel-6.5.7-1.arm64.gpkg.tar 73390080 BLAKE2B cc4e26bc1a73405e4039c943cb0ba73bf215694cf5936e0f20bc9356c9dc3adf042901c9db771cfb586ccc6f524fa444539fc49019c77b4ac2ee0cd29dd97ebb SHA512 4a55ef7726e114f180627d3c0b1d7077812f7920a7bfc726e28e44d810f2a9af1bff74a8c0ff73d396247ea865c0045c49fbf054961e620127f12d483a9630ce
 DIST gentoo-kernel-6.5.7-1.ppc64le.gpkg.tar 64430080 BLAKE2B a79c67c1bef8d40eba08a9afde1919276eece3748ba35940609c2380c09926751bcfcfb6c415f869183e39e82758f9ec55feb401a40f5040c707ff1c879c6497 SHA512 9934976e2d009e72c63efeee9deba67fcef7a2e624d9660cdaa812a0479144931efe0663aa5e07124e0105277f8930a6bb9ae3f2fc90fddddb9069da71c51055

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