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

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

2 files changed, 141 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 39a2367007f4..9f70ca0c2216 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-5.15-60.base.tar.xz 2403720 BLAKE2B cc8a8e72894d9139fc2c51412e09
 DIST genpatches-5.15-60.extras.tar.xz 3932 BLAKE2B 2c9b704aa65d9ba6fab93252cd581efe31324fed7d1886bb118a25efe26daba4dd40d75cb263edf6df89323e9967b6f2277692fdcdbb6a50146e669f45c364c5 SHA512 e63206136bf81d5a9012d71396474f6214cbb7980ff4427fa60e69a7d96dde918174a964a6269e6278b4bad6f5faabfb79c1d0c5e3dfb4efc4f13fbc17979273
 DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398ce4f136f5101e10a8764885202e799e8d5a6a1270800c5c8cbec98aac4ede007a49616120356aae66008ef2578698aa25dd3e SHA512 88cc84df8f11c8f714a629cba8b22dc730b1cc90d5285c2c5475ef808715418e4080f421ad268c7e8a34c18dc70962b89fbbb23c73ab5f3c76f30435d98ad0ee
 DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf208d62642df674863cc905dceb0e91d62cc3e64f1d0d4ed99f0ca9c010108b7df58a12a34b6291eab34f565d9d4ec69c2751 SHA512 17463a7d9e3a2e017654e78dcffba58114ec5cae5e67858f7f3c50bf14a92c1b488f85f4fd5fb61eb53fc74f6a90f0ab152ba9396d0d928050851b4c5ab643d7
+DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0
+DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c
 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
 DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
 DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
@@ -94,6 +96,10 @@ DIST gentoo-kernel-5.15.57-1.amd64.xpak 70814653 BLAKE2B 99e6bb35f304227ed7fa30d
 DIST gentoo-kernel-5.15.57-1.arm64.xpak 64192337 BLAKE2B d719fe17b8c206229d28a03886b030ad3a2230dc33d1ad9158b6dc23f6cc9ebc006c503e8dab1bae2719536410eb7b6b4f60db3412f10d8e8ffc368171b45830 SHA512 321faf33d9b33b48ec89bdcd13b628acd46686b02c54c02d36f4530cecbd82d4297dae46469d12065965b9b62cf5530c5a1fd6ded68afc83e39b338893931cc0
 DIST gentoo-kernel-5.15.57-1.ppc64le.xpak 58147474 BLAKE2B 40236b5a0b51e19a60125edb2138f924f6f9c2a3e4169138bd42c387b6a788bb617cc313c85fd2c5a940f06a46125dfab5ae2d0525f78448935c06793966109b SHA512 0e4bb5eff0aff0cab72591ed85a6be1ac33532062c9127f6b02ac8683ab51603d2684a1a5a22d5a9c3d2508aaa5ddf583d64115861215d262339f16dd16f9459
 DIST gentoo-kernel-5.15.57-1.x86.xpak 61007112 BLAKE2B 1ecdf4d19673839a649b67d28208b4ad792a3dbf1485ffdf8b503f50c4f1b6c90bf9beb846644c212667cd749423d5a13c5b92c1bc754fcbd14f0a470643c80d SHA512 fb936a9cf568cf8e975763fe417aca93b94a0b52654e1cfaff72e5dc4b703a6f77638fe7ae3d5e14f8da1bf92e4fa33d7899f32f0a6d5e6771b0b75cc220a690
+DIST gentoo-kernel-5.15.58-1.amd64.xpak 70871436 BLAKE2B b79a481d3cbe5c45510792a0646f8eae84f12939de34297baa740183c0a38d85065b350218a28511a5f621a5b48b71db3f47ac005df0287a0f3e88466ffcae7c SHA512 aa58c9af896323a046789702b38c71b288c3fdd809c0307c75c41f6261b72a2c6fc07ad4daf8edb4fa7b51dd94e6ac2a30e486b3634ad35adf7634f4f9aeb700
+DIST gentoo-kernel-5.15.58-1.arm64.xpak 64207429 BLAKE2B c2b13856bddf48270f8c24eb817ce989d91fb9886388ffa4b61474413ac4591bf924035b1b2d376325d3955a16ec4d7d6fd3b77ae395af117e90a8928fec0129 SHA512 e50371cce4e199b4dbe22da1d1bff9b93f54dfd4daa8aa1348ca2c648a8729ed7522a4e473f2d1d8c36cb98fb1827cadc7cac0275857c81e410db0d8eb14b070
+DIST gentoo-kernel-5.15.58-1.ppc64le.xpak 58156088 BLAKE2B 7c130e85990529440845990c8487b3df6fc7f23074a00ba16940f0c8eff84b63c4e429fb20c8b22fe6605dc04a31455ff6712164a6b9f6436fbc98cf84518823 SHA512 7543f10e2b8f5a6abd0a351cffbb073af766047716b14731844e624041ca66944e26b4dda00abfa4b03fd4e76351863727f70663cc912d50d4372c81a5f3cfe2
+DIST gentoo-kernel-5.15.58-1.x86.xpak 61067136 BLAKE2B ad13d29c9f4bb52948e657fe847d6f7364d85304fcd2dc13afaae0920b73abba1adfa8d687f4e356832c8a1a1b3eb68b111516a32a2302b53c8672e2d4f0fff0 SHA512 1de82c0e483b42cc5bcb11ead64e5dd5f6b1488d188103f2750f2ca34e22366ef6b22949040c3b03515c6fb93cd67024e39f7bc6b13f4037d37a836148bd3d13
 DIST gentoo-kernel-5.18.10-1.amd64.xpak 71603500 BLAKE2B 8a0d80fb825ae370cd28f587cd31b4bfb8bf4a679848abfb5c201738c75f0030deacbe77acb1ab367260bba8dd0aa69c5be691857e48e1424b98493ecb5ecd81 SHA512 10460c0153afaa9dfcc5df28e39e6a3b224cd0b614df977c5f84bcaf147178dddff5b4b7524b5a15b36aac873f7b0ed356dfd0771920cba1da7f0fee48144750
 DIST gentoo-kernel-5.18.10-1.arm64.xpak 65243483 BLAKE2B ff8b7846d93f4c57c54666e866f27f8a5fc11f21d546f8c028124e3f2508ee4351f4a3cd75cff254e0cb49b0888ef9ffe6e3affc9f7146b3cc565cbb08edf59b SHA512 aec1358fff66b30c484be9b914f3ce2bf3ef88f41de71d717a5279a4df09aced85275255d9af112e54d4d71b827fc7cfb7b6a4383fc3c2024a72471ffff1a4be
 DIST gentoo-kernel-5.18.10-1.ppc64le.xpak 59437353 BLAKE2B 2ea2d838fbfa1e72d9bf056c627ae983ef75ca1c04a3656282a4e6d701fc0ec65d46181fd4cb513e8ca692ed92bd01e3fbad4a3d7e3e2a3dbf9b441596289882 SHA512 999791b651b107f50b0a7262738b61c39f540b17e83edecc3616e6f8f73454ec8a10fdffe14358aa791cb0c98fd5365e50118edf9db8b31290d81f338bca9f80
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.ebuild
new file mode 100644
index 000000000000..cc187009eb97
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.58.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/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/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
+}