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

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

2 files changed, 133 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b70e4fe5adaf..22d2304fd5d1 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde2
 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 14e3d451ae6f21219ed86f8fea2cd8c4888e8b8d23e43d6d855ccb3e07346348aa267e0e20e65c0cb782c3fbb0adc98e3e6728dc83d58bb8dbbed656b3273076 SHA512 1ed76b47ee510074787be882b999dc60c108e1411f4704c9104936f808b12bb97700883f2eed9e41d6da6a0cb5fd00cdd47f267cff1c34173bed49e1379a8786
 DIST genpatches-6.0-6.extras.tar.xz 3804 BLAKE2B df263043bb2e5608eba21f3e3512628029043bbab7dc43c1190e341f66d74d7adabe224a7d726aaa23c7fb9290544419b10704e6697a45c39d1932acdc75627c SHA512 243a9810ff21706c2624a796f61690235c37faaa0b748a0c3e80bf4f7e3f6ed2285201a1f6510e03f3244adcbb3c58ecd90e6f0eed09fe06f469725792554be0
+DIST genpatches-6.0-7.base.tar.xz 373860 BLAKE2B c6cce4c024ed86128424d47eea766acf42c6ebee468003aa072a20254261c2dedea7833ec55af4a9b04bc31e041e9489553ebbbad4419176caeff77c1b14ed8a SHA512 d7fed4dbaa7baa89fa045242805793a0d5cae0fc32e4ee05aeec482b41776bc6acc96307aea63cffc7521695a31c6033d183b41c1bcc6e89b580b7a67439d019
+DIST genpatches-6.0-7.extras.tar.xz 3808 BLAKE2B e332e2144f8831ac194ec1bce1e8b1bef7ffdd8a1ad76003153abfe0d3d5df2db739e8299f033a67d539b51f7d97645d447e023431fddd3ba06c595be3798748 SHA512 43a5ec73f5f552c557d2456df96e9996499408a9701f35d37e78b9363ffa8e319a3d877bc45702fe3fe24f9cc8c4c9af2d0a63e3b596c4a5c7715ffb8a9ce2fe
 DIST gentoo-kernel-5.10.150-1.amd64.gpkg.tar 66488320 BLAKE2B 548b1836f84cb713bfbc3a164e218f5d4cccc19287b3a7627de422fb521190401d890cac611a018f30fd6e6edff2da939cdb15e819470f76bf29b974b7b37f18 SHA512 c578eac829553e923fd0eb2fefe6cd182769e3ec74ff59d3a7c1d2b9cdd0838d32a16cc8f6be0599313d54da1a94d009e5ca9a8726c7f494a5d9820078430aea
 DIST gentoo-kernel-5.10.150-1.arm64.gpkg.tar 59648000 BLAKE2B 07d60e7576f56ddb93fdd8128a0a7392865ab6ab6d87069aca8845aea7128fa1cec81e9f7733e9620c77036641a027a6d64636b3c8561c2483f59a17e3bce888 SHA512 8c193e9b4e2ff698912c5fa09c8644561e9d555434a7b1f2d7406c9045604a17d7ae7699d264fdebd3354f30f7e0f679e0fd87cbd373fcd4b843d05da304a49b
 DIST gentoo-kernel-5.10.150-1.ppc64le.gpkg.tar 55029760 BLAKE2B 144627355aeb03f3a7886603473cee7579b7e9cf4d8bd8e53dd6e65a2713a008d789dbb4b0c8521c295d300d8e5e47c1eb20abc81f9667eb587d24b25387c8d1 SHA512 00354da7ab9103ce3664aceba5bddee24e66dc610eeed00e83460c776a4056e219ccce73d2bab7ac55d19500456fe8379025a519f7273487b9799739776d91cc
@@ -76,6 +78,10 @@ DIST gentoo-kernel-6.0.6-1.amd64.gpkg.tar 75898880 BLAKE2B 9f21fe9ca844e8198ecc8
 DIST gentoo-kernel-6.0.6-1.arm64.gpkg.tar 68823040 BLAKE2B e3fed7cf9d8b58d029c6ca5c0273055fc67725384e48b0ce58f2c585f0475f5af73022da05b2b6bcfd4b4b7120f4ec17cd985710f931301d4eed98b4adcce003 SHA512 85da99efac7153fbb96c74034645b4a274383e88128407ca68d80d14bc81ad08e9de8189169af7bb591e27ca717797ef853c96b5c5039506bfc68c5ec86fd85e
 DIST gentoo-kernel-6.0.6-1.ppc64le.gpkg.tar 62126080 BLAKE2B f367c776f7f2a4abdb7311b8dc26d5050bb854d394238281eaf644873b1459084573c579e95f61c267c95be3a5832b5001195598b252d43b715474e7a6844729 SHA512 7835669158730c244ef8f2cfcafaab73c8a7cef0ae524920fb3ee3276ab16021740a42484c9e88ae3890a25f81f11017d421af1ffaac23c3aa7ae5ad187d4ce4
 DIST gentoo-kernel-6.0.6-1.x86.gpkg.tar 65280000 BLAKE2B a15712598741b489eedbabeec0053e4f515acfcf0c150973c60988c2ee977909909675cbe849618292b8132fe1221ff7305a5b4e91493d3365c4f73d7eab6054 SHA512 391a3c8d953174ea42c76de8aa11f3a50f5db8738ca08bd2b8f0082d09ced86e3b87a04238935219cd5e1f17b8860fdcf2f16b8231318a403558df82b3313c71
+DIST gentoo-kernel-6.0.7-1.amd64.gpkg.tar 75888640 BLAKE2B 3660241a8f91c43cd3f8f9c732957ad60dcbf41c6708550bf64945dd99b91a132b4ef15f1806eedac7138073300187453c36ae3f649815920387cf6fef04ab35 SHA512 0b6c624f75e4c88a7a6c5fb5d5ccf9877e890b58a29200302575331015b630f12d672360440db298f5394a4d651d7c82e51ece8ba259f8aa43e91ccf0629ba8a
+DIST gentoo-kernel-6.0.7-1.arm64.gpkg.tar 68812800 BLAKE2B 75b7825619ade7d93334c9c0bafff57320729d67921edbb2043dd65e0f03eb431ba25b0704f538dec0d3b67f22350a70760d30cdb9b1ba21b4b19428ad6138e5 SHA512 cea31691760f3e162f105d0ebf1e6a148f866c6d96d9666a1cd9b39ead24ea2f22eea2cf12c03a21c54bb8ee9f3ddc564011cfa910345d64d3c638d636502892
+DIST gentoo-kernel-6.0.7-1.ppc64le.gpkg.tar 62126080 BLAKE2B d877405244651b9dbcb0aaac13292c5f62744016ae8106c6dca0fd91890991d2178a4bd7cd844d81963096ebb1b6f87baefc9b28a4eceb49ba994f62e39cb808 SHA512 4ac621798783f3bddd033e5c7e3da9daec8a997c56060a232052b66e02564949e45d027fd2652d16abd8c4cf1b019f7fa9b0c72de7c3bedb5875a989264b1b93
+DIST gentoo-kernel-6.0.7-1.x86.gpkg.tar 65290240 BLAKE2B 2af92b8d1de9e77712b7d1fd58f4e9d97dd18ec06f81bccf3455db2e207af7f3f33d8dd4d1f41b709dc2a3e0c11ff797f0694926dd818c67bdfd809ebb2a2dca SHA512 cf9c4055c80df240a81ee536b46e0138c764c9cdd6d6fd048a4ceb6b5b9cd336e98ebd2bae58c4dcbc960a41949e9a8ac3ee7247773651fe5780335b51f81322
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.7.ebuild
new file mode 100644
index 000000000000..2b0e14e98e55
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.7.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
+}