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

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

commit:     9820a7e70554bd33381226c646be6335db7685d0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 16:32:06 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 16:38:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9820a7e7

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 196677610be2..474a70c6aa73 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc464
 DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
 DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
 DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
+DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
+DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
 DIST gentoo-kernel-5.10.148-1.arm64.gpkg.tar 59760640 BLAKE2B 133644550ff4c86ab62eaef3dac0377d568765e0e5d25d2fe392b0950ac94e536ca9dca73bdf192d8994bcc326448529b76dcc8c55f4161c1960cd153b711470 SHA512 07b91fa83c509d62d05e1e6beb9ee80d0f3c68cbb2edf66b70d9646e190b5ea1bf162592c6d091c1699600285891f7abb8807d3d281086eb14c49ec3da457d3b
 DIST gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar 55121920 BLAKE2B 764f413d2c48d9b1a6825ba7dc88ab24933fc08d5e949a41ade557d794a8f92a827b9211d76a0cfc67728490e2a9ba7152f0b2d0d27daf6bebcb13c9625834cd SHA512 0f469b0902d7849c9f77c489f005d64b1ff8ba6e26335188e9ab919732f9111733f603a5a86a22edee5c4e20738140f79e457a8631772ccf8c908f689a3c77f7
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.0.3-1.amd64.gpkg.tar 75898880 BLAKE2B 22fa37348aca6e271a092
 DIST gentoo-kernel-6.0.3-1.arm64.gpkg.tar 68792320 BLAKE2B 0b823e99597f1f89e6753a41b9940eb65afbfd0c43b86c46ead94b81e82f9d1e2653ff2885691fcaf6c0f5e1dc2ebd047fa4fcc0d07a1a559cd72bfdec33d136 SHA512 8b991af4189f77a5c2afcfb1c3323fef4d743eb8243d6fe08202892db4ae77a2eac7b54c49aae649ab385818a85907731f61290541788dd6020246773018d477
 DIST gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar 62126080 BLAKE2B f0ba8e04802ed6a1bc66f9965c83d3beb21b5ca016f3a77c9b0f15550fca521de395d410341d6d698053ab81bb454854a906774d2f819b5a0c04e1097286d5e8 SHA512 dee4eeeba7ec50148377e6912ee57c91715afc0161c14964d5d304446470587316ec61be2c084a524af2165ab6c66fadc89467d83c0a2c5bb299c4b027a687c6
 DIST gentoo-kernel-6.0.3-1.x86.gpkg.tar 65269760 BLAKE2B 87b2ebaf40b3d33d25da9db3ce6cbd045143b1f65e59dfd91854091b86eac7671f2b5464dac9da8b1ec5dbc29b64c3b01efddf57f5ac69d2a67186f18afd0468 SHA512 2ec2d81743c85a5b10bbd8796b6478899ff02f2e926ca38c1e65fa2811d060dc2537a3db7aa6f459d92cb1c3c58482d2547f39a853c9d935172f7583ab2f75a1
+DIST gentoo-kernel-6.0.5-1.amd64.gpkg.tar 75898880 BLAKE2B 5f4ebb5f829f76206838eaa9b89c9bab77a08e6587851b2f0c680b56c5ce74eb7a9a33e7d3e23f109f1ab9b61fdc15766260770e79765ea64ac7b07baab06b84 SHA512 72b33658a30b12947f45450c7c9f6cc8aebafecbe7940fcac476e780c46595d9bcf751849139ab81ddaef6eb1587b965bb3d05d7b8d693222cc98f44b71d1d0b
+DIST gentoo-kernel-6.0.5-1.arm64.gpkg.tar 68802560 BLAKE2B 33ed94c2431e6e17944bdf0bb8a50f420914ec040506cbb3ff8ec8ca752bc7b43be165881b85e4590e9d79665a5215639f84b6ebfc8ac4bd405ff26844668d51 SHA512 f34ea6de684e2bc1ac120117938e383446fc2f19744de95382a24a7fb6044a89711b86fc13479b5e5536c71fde4dc0ec1d9de6939a26e16e254d3ed1f405da8c
+DIST gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar 62136320 BLAKE2B ae2c5b8830f123c5c2a853e5826e701bb46370919a24fef527f40d530e7fac9be23050cd36ea149644c9331954aaea20f23c44f8341d05b9b170adcbddb1bf2d SHA512 70635eab0375b229ae24efe2f2aa123249e8a38bd8fc864cad8afee0643c98f9f7ae7d4b10ea341a8ed14af4616bacfa2e9cf2e12d1aa47dbaaa21b4df619fcf
+DIST gentoo-kernel-6.0.5-1.x86.gpkg.tar 65290240 BLAKE2B bcd55c436378eac2b8ce96a4060848d3f218c5e01b0aa70f032717074a4195c5e31238b0af6720f1951018f3faac6f99fa7ac7e3be07436224cbe061ee68f241 SHA512 278553bf4f605c0b7df947341d78ffa19be12a843e0ecf4be73f22c9648d0cdc7a4d508470f5be1a6ed60dd2614cd006a1868ed2d47bd0ef4815a748af9748fe
 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.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.5.ebuild
new file mode 100644
index 000000000000..2b0e14e98e55
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.5.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
+}