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

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

commit:     ce1e630d83022b7160e1a38b80c1c485cd97e2a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 18:55:33 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 19:25:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1e630d

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f2254cfdebeb..8e5b5012f7aa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573
 DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
+DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
+DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
 DIST gentoo-kernel-5.10.191-1.amd64.gpkg.tar 66365440 BLAKE2B f7086ca26f08468b754b0cf9ce715ed763d2866ebc8ea322fb51fa2ab5146f1c7741f68b82d52a7d54442cc36cd5a114132f9ccb0809e8d0ab0da022742a48d2 SHA512 0f4918273c70f06756c19cd2c7738176695aba65eeaa7846aa6773d97e6d3ac4302be0328926f1a217135d21e2660e6e4124ced7f2304c0f1a408ad2561b24a5
 DIST gentoo-kernel-5.10.191-1.arm64.gpkg.tar 59392000 BLAKE2B feee11f6bc6148ca0a65077a33cb1736fe2d588037bfada383bff1ca9ca7ea71d6f3248a91cc9b152d87a3fb9580177a68b3748c53e2bb6e0309c7a4b9e39df3 SHA512 bfe38e92e445719daddc4fd87b717c652a0fbc5b3cf3fdaab40c1014229a2bf5b504642c21e5bb478d56742c56100271a7433f113c7c231382d2f226a609f837
 DIST gentoo-kernel-5.10.191-1.ppc64le.gpkg.tar 54947840 BLAKE2B eab70963c60d1d668ba562652b73bf47760d326ea2cd3fad8cbf91e75a9329283b9af38ee7391c4bc887c32464a6c8376844135231d155eb11916c926f8c263a SHA512 58a8701b46878dd470a4210f96f65bc85aabb4c8b29aed5d1d61eff2efb1f851c38b648c50afa7cc164406ccdf8ae3bc673f73857903a17c19229f77c8e885f7
@@ -28,6 +30,10 @@ DIST gentoo-kernel-6.4.11-1.amd64.gpkg.tar 84060160 BLAKE2B 53cb5140f149d9efe604
 DIST gentoo-kernel-6.4.11-1.arm64.gpkg.tar 72960000 BLAKE2B f023f2cf059ebe741840a79ff03f5c869f33b143bba229b1499e8edc02aa4e5b28707eb8f21979302da0a747f75db5c8dfb0d545f0fccc081dd64ee5d53924c0 SHA512 dc5e9d29e270be21adf2dd27f687d3a43fe0a9ed56e81c6fda2a4d05582935827e814f869b14581692fb46127e0e201f779eedd0757cba2b5fca31be51a1b64c
 DIST gentoo-kernel-6.4.11-1.ppc64le.gpkg.tar 64655360 BLAKE2B 16702f5aef82f29e76e7ff583903e63c96defdc30efca67f5c629904c7cb3febc39c1bdda16764c4a0c12a60eca97415cff9efe0845b95f6a2ee54f4170563b2 SHA512 9954161681fb69761e5c36db2d357cd73712f8af2f9dd31cc6437bece50e94567976f5d703d3e59c19fcdb82a85e65424a7fa4a67c10d7aa1f1ccd89ce002c97
 DIST gentoo-kernel-6.4.11-1.x86.gpkg.tar 67563520 BLAKE2B 6f95c97b631d2606509b77caa627a4b263a423eb6d9a5a7edaf858c79013030653b497e49c76c582c3420ee40e543b4f75bca57e9ba4f36284219043d0f76db6 SHA512 37eee9fed9eb00c28705233060004b854012edab9529c6ca7a91a825d56418db59234e4f2fd07c61c1791f653246183f5ecd9cc3c161c3b36589242eacaca712
+DIST gentoo-kernel-6.4.12-1.amd64.gpkg.tar 84060160 BLAKE2B bc6e98110cc467d47fa8e1152ba0c822f11b2f9f16de81138ab81a850648383a8d27dfca5772b59104a9272fccffdeed98f81b4d7a8657627b0d639d183445e8 SHA512 dc7334c9951b53cd8aac12e1e2cde718765f9964c784f0efcb62895c2d26a7f1b76bd8d664aea1239cf61f70c2207976df12d4ef00d5cbb9008049f465ebd68c
+DIST gentoo-kernel-6.4.12-1.arm64.gpkg.tar 72960000 BLAKE2B ac0962ce90e566c48364e9a00bb5108c209f77a606f2954e8be8069a688c163a978f496b9ec5e32e3cca0bc9b6b73f5d1645f2881234a67946ddcfae0ff904ed SHA512 16d9f518ada039d6bb16d3e2fb9c3ff557c64bfca3c9a8900125c9431e8d3f18e47a98156e317d5776fcc5aff873d3ee2cc9357a294f03d5b279206bfa7545e0
+DIST gentoo-kernel-6.4.12-1.ppc64le.gpkg.tar 64665600 BLAKE2B 6a74a7747dd0a693e5e9256243b25de82f4800f57aae59546126c275529043147fac165600aac5cf8fc2ada703d7362237068c96a639ffc3af358654a89f7409 SHA512 6cab43585f1c4b10850b9fa8dc09abe255f0c8c41690d21d9536d1a5e68cec0d8bb3896c6357855acb1ab7184cb8327a14ed3de725eee26edb23672a0424ddb8
+DIST gentoo-kernel-6.4.12-1.x86.gpkg.tar 67563520 BLAKE2B 9c0b734586f14da8e9693a990283c29773d04df19c008fcaecc2e481a6a27ac8976c28062bc3788d4cb66f716a68e85d979a45e8395fc2d01559c932510d98a3 SHA512 f2c3f775e5bf37483bf4cb71c292bf215fa8d28eff4aa91049f1397f742a23bbfe63d6a6e08be192ddb82ab0fac9b7c91ec7ab9fbf5b640318d115f8960543b4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

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