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

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

commit:     ff41604430b1f6e7c0907cca63362bcb66201075
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 14:37:13 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:38:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff416044

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0ddffd2694a8..c889e3e67cd0 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.15-117.base.tar.xz 4520724 BLAKE2B a495289b18d587d3a02d792644d
 DIST genpatches-5.15-117.extras.tar.xz 3928 BLAKE2B 6dfd1c20d2f57e42fc28d69bd28d89b30da88a7528849a5504b1d4bf2aa6aec1df6419c68214acbaf971513ee7889bb8647c6b7f294f50da817195380ed8a862 SHA512 b7c95365023067b437751c8f1963f971cdb1cddbc6571bfea841e38d11f4f800f47dc732e8840ac5399ca9aa62e600234200ecbe3f8dc0dd63fe084d4c08b3a0
 DIST genpatches-5.15-118.base.tar.xz 4596840 BLAKE2B d33cfad9149f4f80c98c649c52b794d03619a4d5c6d9923c93b4ce3d7cdb6f0fbf3ba08f1f3c3b93cdfa37d0163ee31f779bf232d36a0b34fcbf5d72c2bf5113 SHA512 5f51627047fa24a1a2dd548c4e2a2b8a7da2315ea06818d7ef9f592d7166baf65f80098ce5b24d243471a0aa8b644c590e4cf4b36f06053d7479f0da079ac10e
 DIST genpatches-5.15-118.extras.tar.xz 3936 BLAKE2B b74dd7b0194cf6881ef699d0b1db858bb8c44780d5263cbf136f9d181a48420ae31886cd762f819a91b21a2f2acb83f3c46b1950dc53367d8efebe8c86a9317b SHA512 1a3671f3abf8ae04afe50639fe27dfbc07f9f51b297effcd587704f88efda801d3df3255f9d04acbdf4bfac9986a2788a54f4e9fe22344aa0166bbc3de260880
+DIST genpatches-5.15-119.base.tar.xz 4664324 BLAKE2B 8d594786237d670753f237a4948f5d0e7a85c9f5762f082fdc65dbdad9bdf84422c110d7da2defa10eb548fb03cf42420d54dba7c8b62d51bd1ae04446294783 SHA512 8cc047640fc20b1cf9a91809f0ab4ffcdc00e69441f52c7a14d411b254f6cd7e6921dc1e037402341dfb443cfc08a3032540dd1fb8c2c5288a15100eaee896de
+DIST genpatches-5.15-119.extras.tar.xz 3932 BLAKE2B fe9680afdaf4153177cbb2380361b18fa252f26a93f57b64e14fd761774596576ff3269bca33fbc6f41dc58d2804e67a664d44167dcd75f8f63c33ff7cc3da75 SHA512 ce0a62af36ef19b6543eaf84491447d65d11bf560ec6db450545b5b88d37552cd3933aed20afb0912e12671fa11de6e5efac6d668f593eac3cc4078d170d3c7a
 DIST genpatches-5.4-249.base.tar.xz 5692112 BLAKE2B 8057ddb24ebbd5ee1b4fb5f5a36b295c4e8ab857e407c5b9e061780e1d23ecca7ab5adfb10ca4f6733a7776c2aa6e353419257c255b07bc991ecb6857aa31555 SHA512 b0057da850ab5368dcbf2b454d408b72204150cc2643e087d2f084c3074de22ce36fa4c319552b90d9059ba279e8dc6551cd6348c3616275b050167bfdb58023
 DIST genpatches-5.4-249.extras.tar.xz 1812 BLAKE2B b6b7bccf77851a17e8b514439a50c44de954ff461af71414c325ca5c0a65d7a79ee92f7a8b708afd28a3433acddd13aa3bbd5afcd82b4181e57ea05b008d7090 SHA512 c4977abc2bbb1c2319e9d2e4aed38419f9e2a70813e5f28d2b799533fc945574d9fee21c881b6dd4926a9c2ebe74ae414ada4993e3fcbd117b6536f983533282
 DIST genpatches-5.4-250.base.tar.xz 5760352 BLAKE2B a0780e42391ad416839c34d85f079f11e9bf1579a293ea1bbdeb95e08e76d1d3f7956fcf9c83eb85223016bd4816d23c87e0b345bcb61b5076e5bbbd42024244 SHA512 8dd686658217cda074e0731c84d3e8c63bfa914b7e607eab28ab46c8cba647591fcd0a726108a08c826290e9edb01f29b6bd135af0991d818666a853764eb11d
@@ -52,6 +54,10 @@ DIST gentoo-kernel-5.15.112-1.amd64.gpkg.tar 69570560 BLAKE2B 7f3b26e8c79ea526f8
 DIST gentoo-kernel-5.15.112-1.arm64.gpkg.tar 62515200 BLAKE2B c95bd9a3318b1418f1a3863caed82cbb7a17aaec97ed3bb96d4847299e1f77c1b88f96f6368f929169bbd210e3e7e30750fe3d12ada05b5f6adebe1c2559cd10 SHA512 0c6250f1ce3220e411ed857e7183a76ceac9a1daa935373213d980b04130fbc5a757d40a682d3d4d1a432af72ffbd031b5e74c9af34f7bdf58fb704532546e98
 DIST gentoo-kernel-5.15.112-1.ppc64le.gpkg.tar 57108480 BLAKE2B 67548c038c5382acdfc967ffabf77f9e3c788e0fe84776bb6fcd29f6efb7486f27cb6c6df2fe17a086966d5a3b321e6bb1d35713d84ade5cea09a24714470ea5 SHA512 654e177e28840c7c5155b555c2754e853044f60dc6f859961a49a3d685e135d38cf1bd4e1e21fa540c0d0ff7838062a7eabb4334238541d0a0cc913a97e5afb1
 DIST gentoo-kernel-5.15.112-1.x86.gpkg.tar 59115520 BLAKE2B 743e4c071034d38171f62f53d2faa0abc69b466a859b51b33acb2efca6d89f8210a06fdcaa529bb9e1a6450830a7e96e432161f6400e0609252cfa81003e8470 SHA512 09f5689748653fc73a7c31f7f95e087915a6216105faffb5c3254e8908dc400bdf177e6dca6ff99e1f7c0cb758180141c3c5cfa1991c8bef0cd18ce9c4b8b783
+DIST gentoo-kernel-5.15.113-1.amd64.gpkg.tar 69550080 BLAKE2B a16f76058c810a2026493b71e170cf926eb88fb9024e776b3c73d256fb6caf349a31c66d90635c8d32d9fb54248f08ae486bcbce95c8efef9ae607c37e33cbd3 SHA512 2c687abdb050d2e7fd3970b03470fa5b922bdf70f7c3915ae98a2d82931ffa4dc932949fde4fc8d1a55f21d41075b56d28b474a0f4563a4811491813ae1a59a0
+DIST gentoo-kernel-5.15.113-1.arm64.gpkg.tar 62504960 BLAKE2B 25b6c09d59700bb103a72489fb594c26b6d38db9689984bf90e17ef1a7d8b862eb8430d1c4bce0008fd754194dfb30aeddbfb4e67b4a7341ecbbafc65670713a SHA512 66e2a4e23622c57c83f520ab5cdc38c3be19d860a7435c1107869e80c46257dffc5f2a1a59dce8c27f93977c2f99cdbc32cd10c361cff7a2ee88657985de36e6
+DIST gentoo-kernel-5.15.113-1.ppc64le.gpkg.tar 57108480 BLAKE2B 9e2e59c22499dbe2a349906f3384109574db6da4f588911f6617ae8fd44665c9b7be693ac44bdc655fee384c8ee7a326df3a2bec562f6378251246fc916e3b3e SHA512 675446aa59b92559812e21f47da17f76cc46c27de5968babde8d0ddb4afe89c255b67f8ef34f083f4ec723bee717732acd175a0cda91ae878d6c352f4e31c44b
+DIST gentoo-kernel-5.15.113-1.x86.gpkg.tar 59115520 BLAKE2B fbafe9571a7318d02372cacc9468f9d79074ed6e1e073034e2e414f17643f8d84638f6e346377cf8a35af898d174e6216c24a5271e87c61309d0a4c517e7023d SHA512 b83daa6fffd2bf177fb921c08626838ad851d315b8cb32dcf1673311623227eb9c55c8316aec741a49af6e6aaaed527ac4105df58033476f00a6afb2a8bc1850
 DIST gentoo-kernel-5.15.98-1.amd64.gpkg.tar 69632000 BLAKE2B 559df6dda38c4945b6c76f6ccad90a34877918947ff479ffa9003a9cfc4ea697a95523957efa80853fee2758097fc5bbe3ea8076711f898a3ed84a55e4221b23 SHA512 0f6d4ef5edd054319e2ae91cef39af6b7debef4e093bc02f7d476c5c64517aea5f36ec88fa350bf8c5214d00cbaa1502b57e03c2f516d5e49f2cf0ef194444b8
 DIST gentoo-kernel-5.15.98-1.arm64.gpkg.tar 62566400 BLAKE2B 1345fcb22ab95f56cd8671f0775493b8f20a7be825b2a05abbebf1014f26d7144d016f7b58312bb72bcdbf29cdae36fb8f52e4603a83b260e3165fa1980d3510 SHA512 dbd00061e90c43ee701e75ba66075c3c63fbef63dcd562460ee6a661c2b7b48c78f349e19f9c04d633892034c276e6361a6cf6f7e3802bda6156af0d78e1310f
 DIST gentoo-kernel-5.15.98-1.ppc64le.gpkg.tar 57098240 BLAKE2B d9773016f82e87064775640755d6436a0d86b43377756bd9e5a00de39ec6d6d507b6a6e270c252b851d58d7949e083ee18ca2074a0f3811e16b33f2f6806697e SHA512 de759acf2e94f6565ee7f945930cb2b33ba69b7e3916e47c90e13ac280e20a668b95fc1c5f61369c4e6251c91505911b18979ba9efa2595223da8e22cfd71ff9

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.113.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.113.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.113.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
+}