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

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

commit:     64641599d78bca2b7c0d9423593ab0e362bd25da
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 03:48:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 03:48:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64641599

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3208834336f4..698126718321 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B 10f4366a8fe83ca0609c0e2654e6c
 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.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7dfaecf7cc8df376e308ad606d8203022e04a0375a2c9a4fe58bf37bafbfd4a1ccacbb8939fc166590089884ba9989929430 SHA512 69418fe7fe88958d95bdcfb142e6350363180ede26cc44e035a0fdba12d2a8cc542a0ed7789572677eba29f9905af8720c8ddfa13e8257b129bfa95641e72f50
+DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4
 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-9.base.tar.xz 574412 BLAKE2B 339dc1d19a323c2143fdd394b324e8d73b6e21b833e48096b6ae312b188bd9f39811fcd7b93f900c6ceb6982eb6ca108b2ec617b8dc98fe2ec255ec3b002e31a SHA512 42873d29784c0d85434d7eee81ef2000a42164e20ef74c875b81ed8df96ec3632261485c38e17ffa41d94df200b69d8d0e663eb8c90ea741234e860aad9026e3
@@ -26,6 +28,10 @@ DIST gentoo-kernel-6.1.58-1.amd64.gpkg.tar 72437760 BLAKE2B 662048de9aef0751618d
 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.1.59-1.amd64.gpkg.tar 72417280 BLAKE2B 19c2c593f3b792d8a019c3859d7e643c1d6ef09089247bbe663ff1bb3fe9f12bbd0b00be9d0e61b774c0af5df78a45e2d6c7c2df1b818df17e9bfcc63cabf4af SHA512 f727ca7bf4b8041c39d4b383707ef8ecf8b796a5c230d20c8a5e275ce7d260b921a5d645b973f36666aa6f547332e10c0a3ceccc24ba3ff53b490e4363359af9
+DIST gentoo-kernel-6.1.59-1.arm64.gpkg.tar 65402880 BLAKE2B a490ba7a7db6861929fc912df93600923b3a8b69c3131d96ec4c24f9e7880e47db9f4ef587e27d405a413eb5a9573db9adbf9e5a205ee902da363cddb84efe01 SHA512 d0bfeae3aa8aeb7c8f75266795b0efb4ee76696254b0420f859d8f79a11f76e1a10a4fda65ec77ff56a4c65c093d151d785e5cc2a86818c2b8ead747f128f5c0
+DIST gentoo-kernel-6.1.59-1.ppc64le.gpkg.tar 59770880 BLAKE2B f8945e524039a65739082dfa84f1db7d2863aef91d8081c8500522f090bdd2ad12f5aad062286da4e41c1bae1a76333358c48cd1b57fe707c60cadefa88a8cd1 SHA512 213e3d681655b5fd41797eac43e7849bcdc0259797e733dc4eda18cb7fa080bf7e1cc56daaa18279f7c85692b930df5d71c8f86c5d11050f6c5f5b0881c05e69
+DIST gentoo-kernel-6.1.59-1.x86.gpkg.tar 61931520 BLAKE2B bb0466fb5ec12b0ab979af798331d4d5de70521b9fd0f0361e727de3d0fd816dd6c29eb5fa069594bb1e26c2ea1b9e8869bf8145b95834a7ec3df1d2c3f0baf7 SHA512 3708d7201964d4b27013e854bdb393f42fce476996d91da94c0572540b1f96f9edcc3da7e5df1d6415839fde5d3d1d067ca1d50d82508e38128d9344845e590e
 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.59.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.59.ebuild
new file mode 100644
index 000000000000..d2845437114c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.59.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
+}