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

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

commit:     0d739dabac91709ab6600a048c5f0d040f230b06
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 18:27:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 18:27:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d739dab

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9a2925347436..c01aefa42c80 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee91368
 DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
 DIST genpatches-5.15-49.base.tar.xz 1924264 BLAKE2B 413b52e2d56b8da573f23def0f2f6424072cdc1019c06a208986ad7e876a7cdcb9bd2ecac3ffc53ed07ae36756c4cde13713c07058bd67953d40a7b968935805 SHA512 874200e89cdcc359476809b36d118a97839d79df4067e423a9b302d1830f54e381c70d93576ca14c3f2c57b5c3ac256d38321c5c48334e6ad4de527c4821b00e
 DIST genpatches-5.15-49.extras.tar.xz 3932 BLAKE2B f38c4df269bdaca692d05f2b478b3133d5c55810d2e2d8689850bfc50c9eb108943446ebaf44b87889f8619006f6f8789da09137963aef6e08a95784dae65b25 SHA512 9b00de23b1112f192a10284f5dd6f1846d42e3e0df74aa63d58d4523cfd66eea227854aa7088b0389fe70ffb4e945ee7f6e1d845fb299faf0bbd394902bd5473
+DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a51637989cd20e23e33eb1114da1a7102e8ff63c225e2cc8a425b0f34dea6caf1c14094427c479f5a6bca4f5c52440ee0dfe2745db8 SHA512 4fc7266870ca65f000e7a431757e78b7d2c2c4e9c1e2b39ed5492b7655190c6aba624be30dbcb88bf22c2e19b8a3f0849a4f4c388a406954241a47619c1cd0e9
+DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d
 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
@@ -66,6 +68,10 @@ DIST gentoo-kernel-5.15.45-1.amd64.xpak 69297366 BLAKE2B 7e115dee1cd5a433dcd9159
 DIST gentoo-kernel-5.15.45-1.arm64.xpak 64200982 BLAKE2B 37412de110d0aac950bc5a02a0f3608d33b42ccadf743ad21e996bf96d7e21572d61f0142720907e1a26a842a320683bb78011e65241727573f40ab885dcf23d SHA512 0b3cab7beb0982523d5bc5a9b833d79652c24e1c3ba322cc66f66752a1afa8cccf4ba8eed7611eb11fb59641dc93ee31ae6aed8917cc46ca042f96b04d147b3b
 DIST gentoo-kernel-5.15.45-1.ppc64le.xpak 57968401 BLAKE2B c23eae0c10489b9b6ca0e7d8ef53c092d65c3f1295f86cf8aac0efb46f077649037bfb09b7f6fbd881648f2b94861410fd038ce44dcbcfb0c2a4c6212150b80a SHA512 bc551333ad6d455856580d429cf861866be21a7ace3382073173fd851a8cda5d8fb646a9d4953bf34e4b76bda6beebbe2200691628e97ac3265944237981253c
 DIST gentoo-kernel-5.15.45-1.x86.xpak 60042195 BLAKE2B 1751a69baed7b6a7537808e0f41c10d8e306890f5dcf20676c62de5d1852a79ff43cd3356b50e80bf0b9f762e42cf0f20cba44d30c922f3fe1987ea02e1386e9 SHA512 ae4a3405dffa3b0c18c4eb71d9cb6db6d7dce798bce01ee71c080565e8372e218b04f97da5778b19a39c6a7826258a17b179f4599dbc5cab6333cbc7f11eebd4
+DIST gentoo-kernel-5.15.46-1.amd64.xpak 69316089 BLAKE2B a7eb5ebd27cc829fbb8f4998e097d937bf780819035590822403034430be03c6e62788fc289d650e2dbdb5e7ac6eb8e70dfc888389ce95fce72ca1f34878ba3d SHA512 280b928845bea7e3e10482c5f1985565bbc03fb19b3e0673e9f6f20abd116fc30e89a8f2bd9133b47fccee186c50ffd9ebfbe19d539083e975ab4a448c4c8c1c
+DIST gentoo-kernel-5.15.46-1.arm64.xpak 64255178 BLAKE2B 56c03ca98e72a5ba103952f9b6a6ce750d2a528c2a73329e2286c263668f5b8eb1869d0622587a2d452c00c4e2cc179b88c67a28f5d04a9ce135e06afe3cd77b SHA512 faa0e1805438bfba0dfae422d34a5553ccac1e196e57a8e4cd77936ddec33f27cc0bdb9a0e84b96fe14f149828303b80324372c0f1df82af658ee53eb5ad5c07
+DIST gentoo-kernel-5.15.46-1.ppc64le.xpak 57972210 BLAKE2B fbd46b3333f57a183c8e64e77e4c9a2ce324fb541bcefcd21b7e901173bd0a302da0ce47aacb7df5e9f5fd7c38b091dbbe8ad5d4facf64e002caaa14ae8172a3 SHA512 8d1fdf5cdbd2a6d567852d9a1bd0d68654aab671bc4a37e9c2d79f2038f604c7ec48a3026b03aefc6ccc47b0355e2a1de92bf7de377903dd7756c1ede7df7451
+DIST gentoo-kernel-5.15.46-1.x86.xpak 60054201 BLAKE2B 10f44d6127ae59eb814fa06a01c53010452b3e819b6cdf0c54bd89ec80a0165dfd7bd95d3f061ac45450c4b6011817f9da24018d8ff40c0331dbb2b2a928d146 SHA512 59d4b059eb5af43cb165251f7f82821830960421a63697bc8b5ce01a48f15e86a67103ccfdd8a1758cfe6755c73642c6f1da60454976f22e42f46e6bb35ffd27
 DIST gentoo-kernel-5.17.11-1.amd64.xpak 70396924 BLAKE2B 55c9baa3d8048dfe4ca5b384eb96820ef29ab00adea2f19ec40342af80dd1f5a87cdfff8e9f48e74c3cae72e35f810c37e7ea11d4b9e4250fc2304884f4ad7bd SHA512 7e73f9a63d4da4311a544b3f35dddbbe5b06d2483a462441b479faaa3513d02362a27266da93d577c43b972c38b9e8ff838db228802d1212e3036ef6cdd68815
 DIST gentoo-kernel-5.17.11-1.arm64.xpak 65832464 BLAKE2B d03ed7cdb970c02814f903d1ab728138bbc55d0ee39dfed1d797ef5d8cb097f2d4501aecbd582ccd6ad0fa678bb6392163205e7ec488b5899dff5159080168f1 SHA512 1de69d8db852aad7aa62f8ae9190038ed1ee0c337bcd7ee74a0882ec0abc8813eb37a8ab43d1a0379b94c1f2b60ab47740cc9a85971bb09aff20f7cb5c3f5eb5
 DIST gentoo-kernel-5.17.11-1.ppc64le.xpak 58784154 BLAKE2B 6694c16997f231c8bb236988d6476405d581a0c2401c6c8a2c5806194da679d78d3ec059b6308f32cd0da570c91acce3441ac8329c340fa2d494e6765ac9944e SHA512 aabffde89bdf2e39a45b49cfcabe47469df80ae1b2652248b89d47cf8a735f3b59f8274b494dce1fba35ae66ed45216146cbcff53fb13d99cc33323d86466a2d

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.46.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##*.} + 4 ))
+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/~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}.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
+}