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

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

commit:     d012c8f10d877d9a2b2f02aa12650915a870bc73
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 19:11:36 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 19:12:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d012c8f1

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 797f1a596fe2..f1b55513897a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-5.15-50.base.tar.xz 2105492 BLAKE2B 518b28b1244d4a84a02f0a516379
 DIST genpatches-5.15-50.extras.tar.xz 3932 BLAKE2B 969f23628d80be3179e13aa7b09f19d104e13f656446e00bc4f25f3723184f104b18d835a28cfb16fed9fe1d9be68a274c14e294669beec631257f9c77d4557a SHA512 2ea8a7d58a0989198eb0df196757dfd8141cde484a6c652226fe09b030e12856793d2ec5f139096354c808840e572eaa3a236bf0952c47739ab9c13ba508286d
 DIST genpatches-5.15-51.base.tar.xz 2168832 BLAKE2B f27cc35f69f1a1d5ea36b9e21b3b935fe7c5dfeae4f925390b6df852b838e9d771261d64d252dbc0070b135afdc5713e4baec49965f426210d022ef99156a32a SHA512 30b2644ca4c40fc1c1892f022cf169dc180b996abe184d78d4831c435319c840d9f384260a29d1c38b8acaa1c2923a1c52a7f742d7a5f3c309d01dd76a485475
 DIST genpatches-5.15-51.extras.tar.xz 3932 BLAKE2B 14e232d43f8003b7dfc9f083dfa0a86ad8673d6cc0677fb5d56b0bf34dc76d05b903075e36421add28fa06cc1fe0774437e19ae0211f15dbbdba8e920218fd0c SHA512 06bc24ade088f2c7c0d74e308c90fd4689cc35152cda4019272ec78fe8da9129853f68115d7a446fbb05c8fbffec96b36f725427270b290e9a43ae6652a15e7f
+DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526 SHA512 cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
+DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c SHA512 c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
 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
@@ -100,6 +102,10 @@ DIST gentoo-kernel-5.15.47-1.amd64.xpak 69328608 BLAKE2B 64f41f838d72ead30770ef9
 DIST gentoo-kernel-5.15.47-1.arm64.xpak 64275400 BLAKE2B 267fcdb7b3278f131986494a38d668d5531cab0d1c7ca9d2d8d535e1c2f189766e2308a87ae93dd0ae92356c161f8a379f44fc61710e4363a14fc582d59ba6ca SHA512 221c8059e0200fbd09f6fb54d5aaf37ead115490f4503e972a361c8fba7b16c2657d770475fd770b17cfa7f99b13b7d641c867f6340e74f4c353f291c80a98f7
 DIST gentoo-kernel-5.15.47-1.ppc64le.xpak 57938919 BLAKE2B 4b1d65e3cd147a92c2fb73681195496061634e61293ef6f7d14c22ddf01496e98074a2854c18790f0e203b29a622e878b3df341b3995765e048a6a8bbb2723a1 SHA512 7d79fd8f8f76bbfbfa27493c174f628ed97c4b1fc21430902591a796584b4bc5cf9acd0988a176b78a5d8fb6d48d89b9322460909cb0d42bb85c593a1c286db2
 DIST gentoo-kernel-5.15.47-1.x86.xpak 60121310 BLAKE2B 816e8dbcc4929fef3c579a6cb7525a27f590928d9f454cabb39f5094f898cd6e453c9d1a7d1c8ec1ce6de8b8f81dc890e931d01f8836ec34f75f2ec468ccac69 SHA512 e19cea9e28658143fbdb35f34786562bfc1e5fcfeae3fee5576001531261fc7be1fbe041c38f7e8ffc194bc8835caa6fc25f85fc0ec0cf8b78c0273a3879899b
+DIST gentoo-kernel-5.15.48-1.amd64.xpak 69354442 BLAKE2B a95c782168eac06b73cbb26d34778a7f72a837addf9947f868356af45d0fe91e54cc17d44d23db03e226a04e4f890914ad03c29615d250b603bb54f21a703ae6 SHA512 6515bbe9b6191e9cebc11a7bf45c6d87110e26a3d142b1c74a559a88821fa5b9cafc8e948fc32b6d8f8c7f4cb9c1d618a7d72d811cb2565e043e810a1c90d981
+DIST gentoo-kernel-5.15.48-1.arm64.xpak 64179857 BLAKE2B 776c33bf26548d64ef57a1e6519e03d7697fb3e36687c9d821f224398e87608ef6c19f03a45c5f73d2cffba03e7d5e698ba7b3bdf038a6a3da61d1253e81c946 SHA512 dfa64eebe6bc9ec9fe3dbda8903d4631c436ec6de5dcb549f320f439142f4b4e9a633b0be39ce3b5045bc9dbd44746e81fa9b60105d262c9d1f7aa6d09a959a9
+DIST gentoo-kernel-5.15.48-1.ppc64le.xpak 58119260 BLAKE2B b651299e4c429a2c56ddeb4e5997c696ff78ee5b5197be7e86446615204d9f7450b695f11002d9424d2f3284ba11ca4113122d035e2bb28bb030f57b9d04faec SHA512 fc3b787f4dffe4174a7f033204e4c93fe03992ae33a9091736bc6c15fd3d7e828b1f6e57889b9c1bbaf3f7304ed8153ad6868d74267157dfa9172de007417785
+DIST gentoo-kernel-5.15.48-1.x86.xpak 60092955 BLAKE2B eedf565d6e148bca0566f2059bd7c2029eb3a98f1f3d2837890e98ad2622c6eb8b09b02a7045b776ebe8a8610841a718be7cc6c48e72ed25cae3e3d1b8b4736c SHA512 c618f8ecf33d291f80c23508131a898fd0d6d3149da5b522439733a90ffb8f67eea13c9c64b3c726832448d08c534696d0fbc2a228600e85d98fb1b44b8168cd
 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.48.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.48.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.48.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
+}