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

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

commit:     0e740dc20b3a170cdd153b90f947f0b8e9e1dcf5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 21:28:09 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 21:29:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e740dc2

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 51110c4b5091..86c9f0cb0c5f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.4-230.base.tar.xz 5241272 BLAKE2B 59a4ad6f7b2f3380e5521a2d48e7
 DIST genpatches-5.4-230.extras.tar.xz 1812 BLAKE2B 62c614ec2f856867ab6e6953fcbe533fba508263a2f0e0f9e422ba9c4f159af9564d8ad57368f4e8a9e645302b3cdc8ef1ac5a626cb8e18380c025f3290ba56a SHA512 911595072c899538d66313d24585df62a9dd4e44e46980b14e1b6d0c61a64d55b6a66e4b30cae49965900bbbe634c2ebb36aac1d084038829da2a1a59b721186
 DIST genpatches-6.0-10.base.tar.xz 546380 BLAKE2B faad43e3066e880e9074c57499eef61f85a8279cb37b7c999f41194588c766bfcb529cd6bd43b234e865c837ca970706935d6fea32fbcb46c49e9a67d274f262 SHA512 c4e37e027f8c9c7ce833d4b5c887b261bbe617222d4b1203bf0ccbb35b384bb185bfa5e3bccc187e7658baaa50a015a5ce2a41a6d9c8fa5ad883a46692b00d8c
 DIST genpatches-6.0-10.extras.tar.xz 3804 BLAKE2B 392620ebf627c7f480b0031b9e3e712ec0005b7e83596ef192908cde5740df06cec0605b09a15ba9420919b37a61136611a9e3e13f82caa63d0337f3d9b167e0 SHA512 86511fa64c02b703426450ade1811ce5b3614a6a232cba35f016837572e34a7ea0c751eb90ffe971f6a3321e0f9f61f8f032bd1cab5b0d55f8112acff42b4f61
+DIST genpatches-6.0-11.base.tar.xz 622960 BLAKE2B a8d35eea162ef85aec18ee2b1b57e0d67cf4fd336eb1827b4c2d81f85768ea0b633b8010d100b693d3359ffdc373d19c866383dd2fbfcae8d49cf406e9c6a56b SHA512 d2f07ee7314431f324684340f84cba64c008a268ed42f481a9bc885796cf4ba1dcd787bf64eb0028f2cab98afd0226f1b56cf00c7f160fc2af25276339743b31
+DIST genpatches-6.0-11.extras.tar.xz 3804 BLAKE2B 11aee6c336dde017a69fd47cdcd881db93c2b183fae9924bbcac663fccc3276450536325e63a11407adfa0900e1cb1a017d10c8ebf2bb0f3127fdf56cadb1215 SHA512 c3ede70c3ea7ab481fd2e5862254c589d9fb56e0d91e1e8bbfae0fbfa57d325b59e778c765a28be03655d75763da7f19361f2e14e5f8335fb779a083d9b42b67
 DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
 DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
 DIST gentoo-kernel-5.10.153-1.amd64.gpkg.tar 66529280 BLAKE2B f0e4ccfc14b29dcd25ccea3ebd199a6a61092a42d4df68f36e699cf4059674bb0f3056c348fe8da0322bdb9dbc8806e36e87dc329fd88baa0f39c442324ffe71 SHA512 a53fe9f935e05311f40dcffab224791b64b42f218c78e2737d4a4a396df08d0d21f85858d3767a0df329a038c93e892ceadb3db58646d6f103e6941e0b4aa772
@@ -60,6 +62,10 @@ DIST gentoo-kernel-6.0.10-1.amd64.gpkg.tar 75939840 BLAKE2B c97960c5c989babe1e70
 DIST gentoo-kernel-6.0.10-1.arm64.gpkg.tar 68833280 BLAKE2B 59dc4659c3bd764768c6cd00e8bfc0db79ed61207d6dac58898b1074adba764e88f6dfec6f910f04e7615724acfc57826691cdc4453dbab1cc1a049785abfea6 SHA512 e1b27ff83e9c937072e829f7cc0753e423d4aa75776f92118d28a1f8d056c4d27c61d562ef36aeeb67aebd8112c8acb2eda7170b66e476e8c4fb62f5b6b4100a
 DIST gentoo-kernel-6.0.10-1.ppc64le.gpkg.tar 62146560 BLAKE2B 906a047c07a7091b3375c3a70ed84f87b2507337bac3266c86b133e3f4b4dd256449f926d5a54b76bc050ddd3dbf553e6777c8e3ef54a655a31376a00193cfee SHA512 961fc68e368d4a348b103876c6255c7ec25497a06600077b84176e25d99a782e335201a7b74a3cfd80f27c9da82c4ab323d55a7d9f1279fbcc4fbabb8f1f3f61
 DIST gentoo-kernel-6.0.10-1.x86.gpkg.tar 65320960 BLAKE2B 772bdc37ae495658111c5f998c9874eb9947e2a37ee8e0c88d75c9f3e1d981c1e57f841b444287ee334d9f5930f76e2503f9a3ea6154b3bf0a63e9d601b4e079 SHA512 545efb78abe864f1248b4a85f8bb305ced09c343aa0219bfc262789dcd249abb61c956ea9178297b1cc4a188e2fc14b318c7f2c8e39d54daa5fe954b8f266b49
+DIST gentoo-kernel-6.0.11-1.amd64.gpkg.tar 75939840 BLAKE2B 1329e7efccefd3c374ed10540a234022f1baf48963273baec128642a86af71aaa9acd5c459413416c03249e3d26d2923054ccd5d3e803ac3fc046a95ec2c8306 SHA512 0884a4f16e05911efbadf6860289983fbe10d848c840fa71c60c4009d557bafb0180665e46e376f8a5544db209c0cf4d21498debb71ce45893c54b335074fbc0
+DIST gentoo-kernel-6.0.11-1.arm64.gpkg.tar 68833280 BLAKE2B 59ad7cc5b1f335fcf38e2692ad8dd19d2f3064318c812053f443b8dd8f713d57a7d67455418b704112dce3ee215e3059cef6c9142cbe9237a7ccfc9b60ca5af6 SHA512 691e7e9541aabb60ec66190a60c6055d55eaa6de8d5ad624a044b77db6fa9d5def564646809b4458e6ed033fd13b7779592eb9f649daf551bfc5dc4f815e6cce
+DIST gentoo-kernel-6.0.11-1.ppc64le.gpkg.tar 62156800 BLAKE2B 8f7de99ad123b81e5ba2076d2bc433af111b225cca3d73c048d9f76a62a23d5bad06cb1446e9a5d3262c392f06f7f7808d730a9e2fcff987ca081dc1668b82b0 SHA512 36f54148d397833c8ece3f80400796f536d6b6c2e257ca6308727ebb831b605b7664d33c5f70c00c913e50ab34d42df5db110f4e9a8df060a398ac4c42f8589e
+DIST gentoo-kernel-6.0.11-1.x86.gpkg.tar 65320960 BLAKE2B 408374e900ee79394e24bdc9c1773fe0ba7c4401cce4f1abaa27cc89fac4bb4d2ecd26a58431bbb76ffeff4af6f6d9dedb881c6f6919722dbd09a5f294bc2506 SHA512 41cc0cfeb8ef5ace445edb17305b1dc039c1e133cb8adb745885cfa4a1a7b7c4edbdc4ccfa3cc6545ea20dcfd3a2a2a9f849fe7498d74ccab88cc065c4b4a0ff
 DIST gentoo-kernel-6.0.9-1.amd64.gpkg.tar 75929600 BLAKE2B c8798004001baece32bf8a6e242423b04b7e4cea4876fb42baae7e2299adde61591dfa62d06ec385db8ac1b985e8353dccb797b08ef0c42ea21c054c451f27f1 SHA512 4730dff292802f82fe9b6d1c73ab0eb42d00b2d9c7d672ec347c59a0dfa1a586f773a2bf1b6eb7d4e905da1ef678269715f55ef275cd44556520f163002e8cde
 DIST gentoo-kernel-6.0.9-1.arm64.gpkg.tar 68843520 BLAKE2B 6eec02147edfe83ec7a6a62a5d02d6982649c28654f160223ae6e8479b6071174a26e256ca8504e9a8ecb0f6b26036b2972d9be71f6d23bd6c5c627bf203707b SHA512 83cc9b1022bc652cb5a8105c58f3dcda1c21216ffede67835eab9bbec58cf4c2188655337f03692fa1c1b2a4d24ffcd99c49cdef7300a9fa6f1a4f9b4d642628
 DIST gentoo-kernel-6.0.9-1.ppc64le.gpkg.tar 62146560 BLAKE2B aff5949a4e9e26f2a63599953e949c8747bef2fa7ddf05e25b8bb095dd1635d3ffb03d37608b6e84e111616d1438425da0a39f91c0621fab8bc1c0cbe5b926dc SHA512 555ca3733ad5883b04100cfa934da2b979e22f2345a3b5b88b86efbf0b9c111d52062b0a706c00b58a4f891c9a6e3e57350f2efca09b249bb71a4af8e16749f3

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.11.ebuild
new file mode 100644
index 000000000000..2b0e14e98e55
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.11.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##*.} + 0 ))
+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}.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
+	virtual/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
+}