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

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

commit:     927a26772fef50556411d281b7ce41d7de6a1200
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 14:46:00 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:46:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927a2677

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.18.12.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 355b65983e4a..5939c7daaf41 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25a
 DIST genpatches-5.18-13.extras.tar.xz 3928 BLAKE2B 21db8944e961dc054e69901d711a85d2965bc90dcdbcaac4d939e033d7b2007860f594e7bd3decdb5b2ed73b0e6b67872dcbd64a3301fc106cfd1c9c189f071d SHA512 21fe61063d2e4b3ff40664d700643693068aa73d1d5416272116001c7f4ab6a3c006824ad868fd4185fc20fe53647727874e7fff01450d5f5dc36aec84a6e55f
 DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30c8c9ba5cc9ad50c539f1bceb069ad20e6feacc45bc8249b6d23f2f707d9ec3870afc5425140698411070f54593fa33b26f8 SHA512 b646dc8f7dd8177d2d97a52e8bff958ce036edcf1d1304164c8e9e7e6b796383593fb0838cf3ab16b3aadb31aede16eb763c915062763b78676c69a094234626
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
+DIST genpatches-5.18-15.base.tar.xz 610660 BLAKE2B d3a1d9a432ffc110af26d74e96b042abb28a79f77d3b6984c20c5a880e29f05c372a9d499646915eabb71a51441734067b0e271a13d111f15c65f6efdca79a40 SHA512 53856c12e3c10733f6ae78e6408af7d628aca7dac8fce5569eed5b3f35ce58bd465d5e40da2183fd06ce70775c199b93f88f73324c68f73c7303d2bc7c71acfa
+DIST genpatches-5.18-15.extras.tar.xz 3928 BLAKE2B da2016d84154d129ef32595c04f06f861aa91c7981f9122e8120284a04ac0064785ebb2a4717d544c475f63388e36aa2d2012dc426a9a8f9f66492a507e1755c SHA512 743610e02ce92f053bf41351253d27966de5c3dc0a5499e00328debb2d64f7bb41d29dc5670f11e63dbe2e8baf466a7b99fd2b70ba37a7698f53b25044790196
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
 DIST genpatches-5.4-209.base.tar.xz 4887256 BLAKE2B 56d7ea7975b228df055d1bd4cfc41b49890d815409a159772230c6e9d081061a9b438b525b5e8542eb03feb0bdfc1841e5bc5e14dd1570aff8f964862b192b00 SHA512 5ea69d50d836dad1f68f000c6c1f5bd8459dcbc4d50a4fbd4ba3241c4c87638850215c0207dfea6fe06cc596957e3cfa61a3dfc00f0b60513596da43d286615f
@@ -68,6 +70,10 @@ DIST gentoo-kernel-5.18.11-1.amd64.xpak 71622803 BLAKE2B e4e238fd63be1376902a2d9
 DIST gentoo-kernel-5.18.11-1.arm64.xpak 65221648 BLAKE2B f6d4be3e385d7272082e77ad17cbae6ff494a544d6a4884168dd6c813fae32c81ef5a64ad7645745c520af61f1aec10e3fa38dc452eed4a08de7c105607ae8f0 SHA512 c3fbe07c3ce18f83c21566e31567c55e23bcfbf50e3bd59b6203a092fbeee9a75a7918b93afe4bdc39d2f667504733840b97c3353389d57093c933e1c5859410
 DIST gentoo-kernel-5.18.11-1.ppc64le.xpak 59391196 BLAKE2B 88c6f72f8be6826d06f5bd45df57dfd4cd6bbdb1a487fd8c070aa16939ac57aa2d557c66e571a7470ff12f21b261a49f8f8a34f196155a82617a63dd0d9e34cf SHA512 6c4c48e86d34c7ec43d89788209914ab400ee8be7b7d6f81846b223109ce8eab3e6d57f47cc863408cd6783c4bdeaa198d67dba1f2ace7871f12bef5ce02b611
 DIST gentoo-kernel-5.18.11-1.x86.xpak 61815577 BLAKE2B c227b917d18444654711afb26ce372ab35f5ce474d440a5a8f7b1fe1ac687ae3679938e92ac06d1824fb361938e755bdc3c0f294bc9104f29c9f5069434a78be SHA512 9ab4b79a64fb5a1d2dfda8a20f118ed0b1141fc7df9422a6540de645eaae72d70e2db11ed60a958ce55cb4fbf8bf2adf4ce2c1e4bc58d871524d98a2d77e438b
+DIST gentoo-kernel-5.18.12-1.amd64.xpak 71608634 BLAKE2B 07608f0a3b180daf22bded383502a7d2f2dedc7254592a6a66735796d8f52294b05c79e92981b96fe8f76868200cdf8da3aefaefbfe5761fed9bba69fd0718dc SHA512 b4c72515bdcf4892647027fff2ca1d19c87ca311f6a51cb02ae944ac0973d2bfac4bf0be60343fa19886f4d60cd17d9a9c4ccdb690fffe30452e63808ee6617f
+DIST gentoo-kernel-5.18.12-1.arm64.xpak 65242027 BLAKE2B 25e9b47341de15fdc4ff38c7c4b2bc4fcb3e5d6d50382feff3881e5ad8fd35c415174f3b4f30e4550d3474e5129eb8e5bffcb5fcd54022e4bd1cb15112c50d97 SHA512 5ba26d2cbc66644518cdf136a6fa2aa6f6f073e9456e5fec658458144f4cb09613164bea44df8cf2e73f75dcb4b7187f278af0022865ff48c2be4e24f6e987c8
+DIST gentoo-kernel-5.18.12-1.ppc64le.xpak 59511019 BLAKE2B 2340d0b8380d393dfb6aa85a5e5d363aae241a322ee381180989dd50d0d35731183d8360cf4f47c67a60480770d5eaa58cfdec745db14ba0cbde51e55300b195 SHA512 a8221197b1dc30768cb4e7e20ad835fb740b3f268c9bff5c21bd590a05f619cbe0b4552eef6c2735ab939dfa18d81473fad9c0606196b6c77f532ea77f4e8e5a
+DIST gentoo-kernel-5.18.12-1.x86.xpak 61804331 BLAKE2B 69ef17551948afa8114723a08320b9aac97fd319acb2255ec5f807dc82d88530fd26172494eb62d2a5c8d91001918f6fc16344b25374bbc1d69ff3599add5b8d SHA512 55dcd4c2957f91112c6685362fe10ba8fcef909f293364aaa8751e62e24c3b01f773ef6c6e42c40d710443f07863bb69c60a8a96652fc33b704bdd167ad8d76e
 DIST gentoo-kernel-5.18.9-1.amd64.xpak 71596284 BLAKE2B e9eb499b587770b85cd230bfd5219c246f184addc2e4ff72be07ff8d8899a5532f35d67fd6d6c73289161b5ef5e83d62de8d7e6360a74f7989b16b74ab6122bf SHA512 1ac6bc3f97a9ee754fd9aa6c7360a725d2fc298cecdc28583db3ae8bb80c72d0d593a5c8a85dc868587285541437e1c62deac7baffdbf81aa9dd7f796df71c3c
 DIST gentoo-kernel-5.18.9-1.arm64.xpak 65216795 BLAKE2B 1947791701b9ad904633d8e65d97f098be88029a2d716e0e60d91cc02aff9c03eef429a90c8e85a8f1c0f82eaf49a2a03ea342a2b4537da044544523bc6ac2c7 SHA512 6557d0ec1b3072b51bac84dd99adf16cae9eee745a824ab5d39b227298a14ae5f2050aa1079b529593b583bdde0613dfa1fb099dd718d05aa2b3bb4828fc4a8b
 DIST gentoo-kernel-5.18.9-1.ppc64le.xpak 59391467 BLAKE2B 3d7aaf36df9ac13388101e16e90304ce4b0756a39f84dca004e0bccf054f34dfec4133e216ce68c640272047ba21a39f7d44761f2ea9e6985c92a6300c0bea61 SHA512 e6ccb620c255c5ba9e28919152fd0174f527a30906e3b0f30925ebfd37b189013a6d41343103eee57dec5f4afa29f9560bfb0e501d183496d2412214e11c919f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.12.ebuild
new file mode 100644
index 000000000000..5c2c23e12351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.18.12.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+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
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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
+}