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

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

commit:     abd6e3b6bf046c8f69369edd07c261d9758ac408
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  8 21:24:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov  8 21:26:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd6e3b6

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.15.138.ebuild              | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9140c4fa241b..3650d3eaf590 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-142.base.tar.xz 5603000 BLAKE2B 2c04fd46f173dc82421edddecd0
 DIST genpatches-5.15-142.extras.tar.xz 3936 BLAKE2B 76f3aba69251c7c30f2e21b450ae6977c10630448b380552191295d89be761d243b7cdaabf80ae52468327a009d1cb00841e8d15469909363a9683a58126ab30 SHA512 2dce221525460ca2065f102e447672291fed39c21fccefa5d9ca0c2486fd389fe4bce259674ecaa3b6f7dd52d04b677463bbb73543c8ce610b4b729bba55db66
 DIST genpatches-5.15-143.base.tar.xz 5634608 BLAKE2B a00b2898db47b874fdfe2e2bf0c40edcb4f358765f14aba79c686b8d6f99c6a77792d45dfcce141837ad6d956c6ce417453e53b6ede9db2f4e88b501aeabda21 SHA512 1342f8090f18bd15c44ca11409fc09ee5c406801fc077277682595fd58e8f37a57e022f433a0e8fb132cf6bee64f48dccacdbdbabab776d45634477e195eed67
 DIST genpatches-5.15-143.extras.tar.xz 3936 BLAKE2B c942135c9120024effcc516070b81aef19de95969e19c95b7c222ccf9ba515db329735596f3c5dfe81f12ef29165b898de75988f0c632cd228b6d3579e3c5648 SHA512 eb9d0661d81c1acbf5884f3ccc864e0b110a517556bd62020f41f3fad77c32e57da5a7c1f6411a4dc7d9b85ad8fe9af4658613b0a3e9484fb609a7f9ac1a3f39
+DIST genpatches-5.15-144.base.tar.xz 5663416 BLAKE2B a4347f6e6f5916a3811ddb7ce19a506f6f4bb691e57ed5229adb55d90aa2fce14656d1a77d63539ef5fba8c0a5ed8c3cd0933c9f286694a83c65898b77015e66 SHA512 8f4a7429a9673cc2aeffe870ac1f742b6d111b0fb72bff74b3407d13eaaa6200ae7b931449b7c5923c215428b2c55352f728d60a09f1ac7907625f37a454a3cf
+DIST genpatches-5.15-144.extras.tar.xz 3940 BLAKE2B b605a72df3376503172f7a3e7c170fd6b46490061a8a435230372c12a95cfd3deae488639b3ca579c602e86d1e34b1e11c4b873bfd2bc037520df5f1906f6caf SHA512 5db17e336aa1cd4b839b5e4b595e632484af239a662c7f631009a10811be3b87188049eb8a576543f132e674b382b5ba9d9af94a26b3d5a24fb4c654f6a3e2e0
 DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B 10f4366a8fe83ca0609c0e2654e6c64ad47f3a3f1744ca637d8801ec9c8a8c541d74e21e020de0a6de18c98de640810d6934092b2b983b332e92514c2b6443a7 SHA512 1dda1ba93fea4c18ecaae6ec5a3cfea1fbe7f89fa9412e793b7cd0beff43894650167c77d1b85eb280f7754c85179dc3c72e32ca18f4d8a95667501c61958656
 DIST genpatches-6.1-64.extras.tar.xz 3816 BLAKE2B 315826af9d3e7abbef0314f962e2df50f9d183555ec5fb956fa7c9820435042e3c3a72a5ad766a3441543c54986ffbfdae8ff0a4deecb2a72851237108eaee71 SHA512 5a384aa4f6aff1a3410090873f9321ca1c6bcdb48dfefeaf7c2746b950ad22c7a745c60389ec49b99a249cb62c91d517389d5d91c844509dce5cd45a67b47edb
 DIST genpatches-6.1-65.base.tar.xz 3729228 BLAKE2B e2f41ebb95ca74bc5d37f950e088d2d790c09613728d86a58c31867954748d5ce57f484acfde262bb70c2d42538241b6b05cb9befd7efd6ee10a276fa79e4c3b SHA512 815a57b87978d2a0196146ff4e2ff6a7e95d10c74727d458f9cbaeddded3c99c78a24524b8cf1fa0f1297e5bc7f3c9cd743b19f12938478f3f3faa3a68c7e431
@@ -50,6 +52,10 @@ DIST gentoo-kernel-5.15.137-1.amd64.gpkg.tar 66283520 BLAKE2B 2d2ea679a04e830f76
 DIST gentoo-kernel-5.15.137-1.arm64.gpkg.tar 59709440 BLAKE2B fced7223953d9cd91909e7d9aabb0373a9e2f1337a89d94506bf74cd91d197bf634b9497680dc442024fd0c00a9bc72eb08fbbcf08225cbd25de10f60a057a4a SHA512 71c2f9922a3c44a91da482077dc096b3ecf916d44183226ae90f6e7d78a99f927c221c0b6f8ba3856aaf94c13a35a1edff276a3af3b66e18d8c18ed6b542eaec
 DIST gentoo-kernel-5.15.137-1.ppc64le.gpkg.tar 54937600 BLAKE2B 8c9e3c1b7faf27de2d568f12ad413682e82cff899bb0dabfc2d5eedab3e3daaa27c5413938f74ab44c8113e0ba9a61df03e768d35ec19f8011180e49de44aa8f SHA512 884004c75a780a7387f5d29d15ffa4827d57f30afc7abedd82390827f0e9d59c8463a756a8bce1c0d57773f8b9394b57a93dd6cff3a7f4065032ba4158988104
 DIST gentoo-kernel-5.15.137-1.x86.gpkg.tar 56043520 BLAKE2B f1f64be37de87402669d92ca1a25adb5ace86e172dccdcf4aa9894e1feabc3bcea394c2d27697f752e0dbc38a55b6436cb8e76810a642858b6971971370a8961 SHA512 db2a599ed12abd7c225791f0dd35e130f8fee3b23a067e234ae8947965eadb6603c41b28ea0772846128816f9b83dac18e44141da48cb43850a59574c8fca2d1
+DIST gentoo-kernel-5.15.138-1.amd64.gpkg.tar 66314240 BLAKE2B c0538fa7277e41faa5d0c77a8581084f2549828b82f67fbc0c95f5036b5384a87bdc85dc6b33148f3b20e4a421610e03f11b54abaaf5292127eca2d38614fbd5 SHA512 541a96ac8932ec6a67c81680934853376c255cb6a94114e8fa7d46f1608794b497e9c458f9eaadc46d59dc55637e9b11ed13cc008f5c955bb310ba594520a88f
+DIST gentoo-kernel-5.15.138-1.arm64.gpkg.tar 59719680 BLAKE2B 83fe7fc9557c557b8df2d3fe49622515a592ded3f1a059df3214de79a6f8a115e1d5e6e7cb94165bd4ea7d04463e90f27bf2256e9a3ac3fe2911428ad310719a SHA512 89368a42ca4f877c3eb06f9a457297460bbf2dbbac7f27e03a4392053705de77f2546f09358be32eb74a836800781e3e018af40babad99dd71bd121bbe52200c
+DIST gentoo-kernel-5.15.138-1.ppc64le.gpkg.tar 54947840 BLAKE2B 5d5e3081ff037320bf11645d6fbd2dba7e24d95b4316340cfb719c22eded0c27d186a945d05189f7abd4284100692d1e14384ce500135feb399a6223a2593547 SHA512 f9e1d743d480413cbebf04d581d106309b1d9898e03b06fb90cba3eea139ad167e9e1f9c52e35d7e945718305dfcdb3e76c43b5d78960ae348649f84af49b49a
+DIST gentoo-kernel-5.15.138-1.x86.gpkg.tar 56053760 BLAKE2B 0c4c8f30f2b62b055e99aa5ff125f5819255f2ce52bf53df0b6de5bcf9bf379e3c8250377ae64c44451557d529afd2f6ed542283881065aded6d2c7953f61a92 SHA512 d4b6be4508cb6087d359a1d397ea31aa2f745af90196fa568d82ee857f0e92c576345a1fb11098f0cb7d97204d3ff4e3c57de056b6f990168d360ee49e7a7c29
 DIST gentoo-kernel-6.1.57-1.amd64.gpkg.tar 72437760 BLAKE2B 40c1640468f10bfd24c68af91ef6b787a68432d7381d7b36331d94a88605b7b2c9c191cfa20cbebd6a4a255b1e0384d9efee6ebb761b2129b2c5f7b73d602938 SHA512 254a591de6913a1cd4c111c36531da0ec5e7eea06c24adbce7bd16c9e58286b0a7d7355b75b99556e0220fb1caf79c2bcd207947582f340a68aa0331a0f52535
 DIST gentoo-kernel-6.1.57-1.arm64.gpkg.tar 65402880 BLAKE2B 7c373e287dcbbec86b82b1a225fe8971347708b5c161d266687033bd92e7a331238ec4f6164f18fe69f7138a9021e9c3e831800ea031da29ea8ebde0591a26c8 SHA512 f0ccb7b47f4fc9d86bc540ee754c42db0639710a366a309b448b8b99b4e4aa96a5fe569f412b9b30b51d4ac231b5a97ae7420cf6efbce87ef6190eb9a062d065
 DIST gentoo-kernel-6.1.57-1.ppc64le.gpkg.tar 59770880 BLAKE2B b75ef8425ba37ae13d63842535b4477712f96202cdb3898df214a70e436cda0e4a96405a7a1a0ec40a20ed5df976bfa64638af1b0a7eb13ec2133280dd46222b SHA512 60c8ec52d2260144cb8332de2f23d1ec2499fb365e9616fce6f9a8612b4492c670cf4279d69d6d999c223db9e7b9074073b33768d568182a92e84f62bae9a888

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.138.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.138.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.138.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${PF/-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}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+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
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/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
+}