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

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

commit:     e76f907ddcca21cd42922546a50f3638cdcc96e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 11:27:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 11:33:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76f907d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e972236ec020..acc4a3b0134f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -46,6 +46,8 @@ DIST genpatches-6.1-40.base.tar.xz 2034256 BLAKE2B 7a95fc06c6d7f6f3f658d35b21a27
 DIST genpatches-6.1-40.extras.tar.xz 3808 BLAKE2B ee4162db692e272773091d94d06bd2ba11fac8ca9bd4da96396eb450a7ea0c933e49ae9f6a27fc453c40079054d9140578c9d4c80a835f6ced71fad20a29247e SHA512 07a61941a6e0174d309da302bfdde21dce57a7449f3f8263d9005fe0a9c47feae2a5b508062cabaf53f92d6f06724e1acc3c71422e4a8e9215c515d989567a81
 DIST genpatches-6.1-41.base.tar.xz 2664364 BLAKE2B 411463f6532b87253491c5b4d05e4a76c2739408901eaedfcecc135c3e01303a30870e6133253e86b9e1ff10f9363dd7e2f0b5f68a85c7d1ec0e5f1443737820 SHA512 3227ed7184af3db4090c8e081b56f1fccd85f08298cf944c44ffdf808b7b17499191657a71e232e9c5dcaf68c1ca93902816c4dcdefc5f1240632816b87b2659
 DIST genpatches-6.1-41.extras.tar.xz 3808 BLAKE2B af183a6fd9ebd81ed22f8ecd36ba323e9c3aa438e72018ae1282bfd371874870a8a6d52b6488b1940a6eb65192cff46af7221967d4d473b2f3eafc963f0b5ed1 SHA512 fd26c56b8a9c5052e32c3ddaf7ff1379912f2aebc7b57bda68bb9f9bc0b316f8b5ae396e0547f205ab491acdc1fc9731acd87d13fdbb13508efbb6d6fa3154a4
+DIST genpatches-6.1-42.base.tar.xz 2681352 BLAKE2B 8d16c71a41bba911a9ed73e8ff55794caf34adee41a757072db78f4168b6cdde0abb979cc5f6d353a9fbc3c5911e30642b5e8125c1a32fa02e9c946f157442a9 SHA512 be7f76ed509a912fc1913ae7f8dee0ae6b2351cd2175319b341812cb5fbf00b2adc053f9711a991324f40ce77c095ab820fd57a00b7acd006400fd10fc94b575
+DIST genpatches-6.1-42.extras.tar.xz 3808 BLAKE2B 6a9159e3859740d4b14bd081aa6df1dbeeed5f322a3aa3df5b8cb942884b068e713815d7284f71ffcad95339928c120661c0b7a85e7c168b27d3daf88251bd18 SHA512 a6cb074fe4fafb8a336872ce7c5761ac1fe3e3e84836949803c4a46e9bf783d38a4ced188830158493f64518418c46228bc4f79f669258de5ac6b2e1714f7a4b
 DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
 DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aac52c23fe83deaff66eddacb48148921b4f88b019bd05b81f4ae2eb71710cad18613e5001dd4ab999d461f35cedc4c31409 SHA512 7632ff13835b971d44f582853cc54d539bde0ef1ca511ac179ff49143c1bae21e82da0048b6c45d36da5aefd92fa788b108e3f01d6fbf16534394ad7b143833d
@@ -156,6 +158,10 @@ DIST gentoo-kernel-6.1.36-1.amd64.gpkg.tar 76656640 BLAKE2B fe0fce760cad74b2166b
 DIST gentoo-kernel-6.1.36-1.arm64.gpkg.tar 69335040 BLAKE2B 22891bb8103ab759e1bc1d73ae1f713b8397bc3271b04cc712ec93ce367072e9fae82e9a96bd62c9c65ede2514fb9ae44f5b27b0bc39f1c0bb920f8afc94124f SHA512 3c8cff93a311771c498351b613397bf711bc268e8b7a76474f794b474d77630cdc5b8f9eb36d38155a6f4a110eeb302af1f09e9334a76c97df8f3935c7187e83
 DIST gentoo-kernel-6.1.36-1.ppc64le.gpkg.tar 62740480 BLAKE2B ea1184f184d76b4b9f8a1670e82005ae5056163b177316d2875732b6d98d755c403835f3b67515e633fe842777c940a17b2b9401281b8f3e107a42475f781748 SHA512 9a7b9f34aad8d106243b1436fbf440772fff56cc593f9ac6e8a934b56e28e75abc9471e5417580b0a976f1fe026d684d3e0fe14aa8e893cd0760345a4936a364
 DIST gentoo-kernel-6.1.36-1.x86.gpkg.tar 66088960 BLAKE2B a87aaabff4c24785171686e9a03dc46bd8e38b92af67053f9a7059cb54e69bd597a076dd53b890b6c067ebf976f8312ad2a4e3d4a6acfeaaf452157fbce90431 SHA512 9c520e5358f16b94acfed317107b6f91e32411222492e572a2fbb061369f0a11c6f84b6399d9c16815978ffcbe99dbd00a7bc6500b65276630e8bac8ceebdef6
+DIST gentoo-kernel-6.1.37-1.amd64.gpkg.tar 76697600 BLAKE2B 7204283a2097185ccd027f0a548d6cae45ee443f5a904482cc5920ac468026c4aa0b1fec828e7528ff7e59f8f0ebb0933eae1e4881a0ca4528ecca4b10d0b6bd SHA512 05bf03f08fd4db0fbb518b23e7c5f11ca8a3da7556038fae93fc54b1050a6c983feea6a84f91cd05de62de791559129beab91f507b200af942a93afd041ad967
+DIST gentoo-kernel-6.1.37-1.arm64.gpkg.tar 69345280 BLAKE2B e830e1552fc6deab1fffed9e71c67f148785a8920e112099a590b0fc1f3ad5603dcf922a2223cd26a3ba22642679ca7dd7102271be5be0bdec257b75c8d186b8 SHA512 7c6e010ebadb41805ea71ec47ac2eb8213c03167bbc7f6e903fc189bb6380d0375a8eaf113bca2e2aedff4443acdbed32380d0c2338fc34ada3dcd880722063f
+DIST gentoo-kernel-6.1.37-1.ppc64le.gpkg.tar 62720000 BLAKE2B 1567b524fc0e160291a33881f96edc42f23f66a077b5b45e1d7edfd3165c627b7e0602fe538a05af593b486edf920ac546ef39636795785e8a614855625be4c0 SHA512 10316472a6c4456b6043a754df5976899a2bbdc941f6ce30e2028bde5c9fe5ebc2adb5d13507d423d972e420d198edb8bcb2c026012ddce55684bbef0d79ca0d
+DIST gentoo-kernel-6.1.37-1.x86.gpkg.tar 66068480 BLAKE2B 061b16722f89b49977eb51e15210904caac6a7268a2c11609135ffcf93f37e7b14206834a04aedb662218f585ab97fcd584932b2aba37916b37b2bb9d8088ee5 SHA512 f6a1731da1e2086ccca5a365efbe3fde346445fb2a649dd24a83a7dfb0d7ec642dcd9282cf0c46606925cd3697eb5b7d5cfb16b637d635e9371056f76bb47b25
 DIST gentoo-kernel-6.3.10-1.amd64.gpkg.tar 83527680 BLAKE2B 6876423636b0cb65ddc61aaa4ea8bebb16c178f2b94b3591607955c804ab0005dfa137366a4d4a92e855af4bb8adb4a8c760b8c52cbec0479b0229a66044b881 SHA512 8a1bb96504a13d22179eb64609aad6006c384e39ff6ffc4d171f8e410d06e40fc2f62e72581c3fbae57748fa26d392c5db8bb7eb2049e95fe08f9d08bbd47696
 DIST gentoo-kernel-6.3.10-1.arm64.gpkg.tar 72437760 BLAKE2B 1cc2e08db86f3f6d32403c49312718f72112aaa7e6a6ba9c182a4e5f1c0b3e6f144ccafa95e4aab2d1218305e7532642b95f41c1d15353fa5f735be1869870da SHA512 1068bdf4b4216b5a128629024187693f859cfe6625c13bc1fe2bad20e8febde6f68b7348067d70d728226443379b6c315d085c155d7e0b750e7c7ac045354db8
 DIST gentoo-kernel-6.3.10-1.ppc64le.gpkg.tar 64307200 BLAKE2B 96d16e1102ecc35e56b5708dfba9d4974ef42cc556150f7ce3a73163b72a1ff1ccf93572a35fc4cf4405a0acadf6932827b45f0e6dd9367265a8c8ec017be5f5 SHA512 e865b02ca02ae97f8b1fb8b5982648a253b09bb980a07646822b473705fed2ebfbcc8f13fac4a76b4c0b982a12523f1eb3f89118a0e64087b64c2d9a657fc420

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