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

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

commit:     f995c9b0da8e4823082d9b23bd61a20e602f4b8a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 20:19:17 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 20:20:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f995c9b0

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 10cf9d5ecc7d..efb86022beea 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398c
 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.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
+DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 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
@@ -116,6 +118,10 @@ DIST gentoo-kernel-5.15.58-1.amd64.xpak 70871436 BLAKE2B b79a481d3cbe5c45510792a
 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.15.59-1.amd64.xpak 70780970 BLAKE2B 6728820f88324d719530871e41d40e80fe9f7324c6d51695687e83f9ace6f40e373f2d1e4cbbeaee671141a9036c3a27ae00d165033c21cc72d4e9154a402db5 SHA512 f6c12a43c6a192fa2b298903db53d6ae73441a659971aad990235bdb1847df79cf0cd1ca4f8ec4cf30a421b847be274c8c35dee43479dcaf4f95609473fdc108
+DIST gentoo-kernel-5.15.59-1.arm64.xpak 64214058 BLAKE2B 8c92101954e62c9ba3eddfd04726dbd03d254d6f506f5072dd1c7d725d29c498d480a1697513a3459127ab133aafc1657d1c9872beb7d5925adbb7bb5fc16ee5 SHA512 0d21c083fd3f971d2fbeae1d012dc03d4bd17bb37ab59e5bab6e87f171554e5ff19703b234c0fdfa9a9e3e98a295fe8037d49ed252a141603debd0d33149bd09
+DIST gentoo-kernel-5.15.59-1.ppc64le.xpak 58200347 BLAKE2B ee5d04f4455c9ed7449e06078f96a5372379bb11ab34b2aa3f39bb3d6941959a4ebcb99ecc3f47532944588c92c4c59078ab1a0f2a2d32b459ec6c8082546850 SHA512 63e9a38db9414b8851d274942df40ea5f35cd0200743aae906288a436cd0121e71e1a7541224a0707e261b51a1d474d5921838a134bc4597b009c7b8bf9885f3
+DIST gentoo-kernel-5.15.59-1.x86.xpak 60984002 BLAKE2B 8a47890b6ceb979684b68bb99e54efb0d4246ab595d4e46441cd4f0e82a580580f17d1911d4ce08ed79c7d8c81c74c3780f5b1e4dd1881ab28bc74958f30f71f SHA512 35efcfba200c6bda7183055a7cfff277472862f44a4abf3c3bc8c0e701135ec9c9f4f9ed65f4c685f744b963ffab9bf79d1c82bedf4807eaa05737d949063feb
 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.59.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.59.ebuild
new file mode 100644
index 000000000000..ef41f9ee8cc4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.59.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/~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
+}