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

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

commit:     d9be896f8636f0917f745ee517abafed536d00b4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 14:13:58 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 14:13:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9be896f

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e0a02db68f71..b6d0e466b847 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-87.base.tar.xz 3545732 BLAKE2B e69eb4d31984b65ea5e0c216d066
 DIST genpatches-5.15-87.extras.tar.xz 3936 BLAKE2B 05717f3f9ccb161a5076c6623f15465729ec898ab7a8fb4e611d07acaca96df6b890a3af0890dedf6acb06c7db148df625fafeca5099eb96e31ae981e00a23e3 SHA512 ddda9d1daf3f71a8aade12758db2d698b2230a20b3df059437fba02b499d2a90f2bb5a5c0796b1fdf842ff64e515193ac97aa324a4047bbcceaf4849eeca2674
 DIST genpatches-5.15-88.base.tar.xz 3548532 BLAKE2B 947258e9bb979febcca994f82b9ca18df494ac0d7db4664a96ccb4737ac71151f21070d30e4e5665c53d4c444bf06471590a14d17f83396809ee9013064db317 SHA512 e071daa0620c62e5ba273c6f5c4134f7c6f179b25a7dbc10e1f045b6becef1182e0f27620be0f03f32926d5c2109f7802335dea9caac1d576c47bf92c0532045
 DIST genpatches-5.15-88.extras.tar.xz 3932 BLAKE2B d504a1d8dc4510e870c34d5e355944d2e79646102ec04d5a268774e29ead5255ae6cd51f3de1b10992c8bfdfda3dc16379b3e6aebbb18bb528caa801551498a5 SHA512 85d01fff2ac04bb439ffb2a648d665358b5631f086db51b1ccadf31a8a74f94445c5942d6ac25676aefeb7a86f3286a8a7320fcc30bb092c212f2061d3143263
+DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
+DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
 DIST genpatches-5.4-232.base.tar.xz 5291236 BLAKE2B 9f80382d51bb96d5f3b62f9a6c35159360775df3092301638f36ff2bc13f8dcd2bc18816f76d7bab8e341bf956fbd198047cdfb6d020e0c419d431e0dfcf5754 SHA512 e3d6f7c08667dfd3f69d862f6057b8629916c13e1a0421c254aed0462c8725c3ddfd8a75433de1f893e050a9451299281d6d5df9a4d234644e92b2dee1004074
 DIST genpatches-5.4-232.extras.tar.xz 1812 BLAKE2B e2ad941ec37d92e646f7c5d8da34b0bacaf98fcc96da2f43a4257a1e9d40bd8b90965655b67bca2a986249d0971c9ab27f892be5e7bc6e9013f8d8143638cb38 SHA512 4cf015c2847d593177f842241e67aa8125d19fd163883fe553799c3b7af6dab4c2020462c6d348478a5b539e0425e6510749c537862a67f5f8e185594b6d9d59
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
@@ -32,6 +34,10 @@ DIST gentoo-kernel-5.15.84-1.amd64.gpkg.tar 69816320 BLAKE2B f6bc19af768fe43c64d
 DIST gentoo-kernel-5.15.84-1.arm64.gpkg.tar 62883840 BLAKE2B 620a33c02584bdea424fefa62338f8f1dced47abf1fa5df9b933c30e64ee680fc846a1d4fc84b0acc0bdc913470a9eeef6ec7c9b564d73c77c5b87c23acd4de8 SHA512 62778e2a2281d720190778300b2656d97db1d9bf5d31fed74ef87bb3fab4d9c0eccf8a02304222a631d03206b43f76ed5447c82787a5f67465f84fdcc4a1a6c8
 DIST gentoo-kernel-5.15.84-1.ppc64le.gpkg.tar 57231360 BLAKE2B 56fa94652ef5b42fdaf853077cc8f5a754d44dac312c36d054811fbdf0b14f66eabae60ed227b83788fd7b138c39670aa7c1f6707a6c86fb7fa0fc60c1a8677b SHA512 e327a7a9cb0c1370c77a8354676e2f3cffc43f41c4ddeba9198ed8d4d8709da37bd21f30d7f4ab3ef736a7e921543e4e611104fa3e4797bd07433e99e59e263c
 DIST gentoo-kernel-5.15.84-1.x86.gpkg.tar 59136000 BLAKE2B 0fb3c3d517aeb0596f1aeecb4c6341041b4ffa38cc2771de6c2ffc625dc3d2fd91a8094fd4222218b56ee226bfc8f6bba0a2615cd9e720a4af9511d8a7f5d194 SHA512 3b3106039e473c65ac16c91ce56adc4ec2d98965581c6686e41c8f7e2aeac299011a3b2b879dcade3a22cea2aaa2a1c2b7a49d7db0c302d23ca5dbff04de20a0
+DIST gentoo-kernel-5.15.85-1.amd64.gpkg.tar 69806080 BLAKE2B c8a30ead36075a73121fb0a9fd3f924d1efbc6fbf38bbc5d997cd5d9d50dcf6daabc4ce9501ed31c151b847c7a80dc4a86db50a2491644245fc6c2822b360eac SHA512 5b36794fe4076bbc3ceae8939ba15c2aede768d03acaf859a349d23bc28d540409655c7731a0b6f671a67b789a4563dd21d167315bdbebe9bb81462c4c72e3c1
+DIST gentoo-kernel-5.15.85-1.arm64.gpkg.tar 62873600 BLAKE2B dd718f470550c4243b13dbcb3c2513fbbcbc168554b4fccf483689772a59c6bd92342e80ecaced38e2c5ad139b6cc19fae54c6ecd90f3d58bbef5e7bc2692799 SHA512 6c056798c28245c297703b97859c2219123ea00a8ee816694ddc186f5694444c5854c469b52830e9c2f3d4978b469d83707626e10f9cae4472c29ea8181d4472
+DIST gentoo-kernel-5.15.85-1.ppc64le.gpkg.tar 57231360 BLAKE2B dea31232116da911864d2ce1ec8a62e2959658ae339483fa23a3251fb98cee1821ee51a24041b711bfa317f9b4c2443f1c34b4643ac9b8be3788b04fee0bcae5 SHA512 de537a3f7e0059f94b6b7de56776e10fef13658aa464e54e528cbd5dc78eb5fec41b0c428bc5f106d16b87745fcaa4d767cc3b5843c83de26a5eb568f9afe613
+DIST gentoo-kernel-5.15.85-1.x86.gpkg.tar 59146240 BLAKE2B c56de581cecc5c639f674b09f005b504e886ab9b2cbcf8d3d69702f1db4939901a259c5cdfcaf60314093e261177b6128822351c2f4973e9b16968378b6a74d1 SHA512 eb01dbef71c2c392148b1c344a735382f077d3c69f69a13b18aa9cfcb74738c973b782083853b1a038bb6bd85364efb563d353523e72f26109a6644d75f25850
 DIST gentoo-kernel-5.4.227-1.amd64.gpkg.tar 60620800 BLAKE2B 0f28c20c298a521d5f64220070405cf38e896f6b45d86b12cc5ebfa55471dd45cab80a091b846552dc560b46535c6abb806e46010608464620c23e74c59f549a SHA512 b000f3df63086bdc3654cb9a407c9495bea3f0a31a6abb51d5816acb55b499a6e9f9bb26f33a03764f155eac8a95760601fa3d1228a540fbdd9a8b268a122d52
 DIST gentoo-kernel-5.4.227-1.arm64.gpkg.tar 56832000 BLAKE2B 7b3a5dcafb9daf8a4f7497d853812537f61f6a99390a81a60ceab4ed950d5d660929809c59a71a9416c05cad9798d5da22cb290b08846a943f843330e8b65c6c SHA512 5cc99bf2908f6966c1dcc5dd03be80b9504365b84a73c3fe915dcdbc55edcfd8eb9b785fe3d4d27171aaf9701cafc79e4b57e719f3d46c37035b34a3905b657e
 DIST gentoo-kernel-5.4.227-1.ppc64le.gpkg.tar 54343680 BLAKE2B 2725e61dae1782f494a5378e9ede0352bc66e95e1436ade7157fe63cb239f06c0f9843a02729ddd5595e2a216bbec1e3d5180aae3a590f10be2331cda3afe5e2 SHA512 48d749c5620eda2fd6c33ceb9cb8c1f6eb2ae7b7e2ef0382bc09c38308a6f5c97998ce0b418b57ffd73ed6827ccef531d76f5739b069f91ca67f7f9b286fbcbf

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild
new file mode 100644
index 000000000000..cb9e8972e872
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.85.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 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##*.} + 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}.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 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
+}