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

[Michał Górny]

commit:     9a04369fddd421fee7481e4718589b08dbc54476
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 20:22:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 20:22:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a04369f

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 505fe8a24d8c..a185062fb87a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad35
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
+DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
+DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
 DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
 DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
 DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
@@ -26,6 +28,10 @@ DIST gentoo-kernel-6.0.15-1.amd64.gpkg.tar 75919360 BLAKE2B f48ea878985b13fdf57e
 DIST gentoo-kernel-6.0.15-1.arm64.gpkg.tar 68833280 BLAKE2B 770752caf91164ce5a84c146de9756150b64459c0ab13801bf540be80857c5b181d1f2438812e7063c4f8b65dbcd795d12ef9f521a679f56e96233ad90d2c20f SHA512 2641b8f0793f710cb08ff3b1076c7fc68e83720a80dd84ab2ab8744d5c47ef0218cf8f4f01411eb6f2379177b798e59708e5e726d4cb345894bbb1fa7d248aa8
 DIST gentoo-kernel-6.0.15-1.ppc64le.gpkg.tar 62156800 BLAKE2B e9e0e2f559ca57a51d0cc4f17278fdb70415e514eb7e816c351736bfc4e65f5212245cd3547c0dc2195419441484e4c2f35ece975472a28b569b880d9e41a679 SHA512 4af5fdd89ad8171990f4b7c0b6dfddea43a5e021a26f93058760c631f6ded682572482265f12c42be23fb389cc88215ac7b2d34e2278df86ffa86487528f258c
 DIST gentoo-kernel-6.0.15-1.x86.gpkg.tar 65320960 BLAKE2B aca1cb512c6445572b844e7c02243275e5bd8863d62b1b42dc2d7ffdd0197fe24c05e6319aec18e591ed7e99cfae7aecd4b76b54ce76ed4879c5eb05d8ca7c1c SHA512 9230759155e81b24dc8f2cb47ea7a6524a6598276c1b9f53509a83385d687c321b8eb5116fc4334f36dc8d20ef491c7b3e93454bf3b6e7df711be5a3947f9bc5
+DIST gentoo-kernel-6.0.16-1.amd64.gpkg.tar 75939840 BLAKE2B 2024eb9f9ed61b1efd2c06d0feeea4fa5dea13c768e5e1a4f447cb5c2ceb76d6f604d2e6b9ecece78c87cad18a41994840981685d4d2844d208333a9e4bfe873 SHA512 b362485887f83bba5986d8b281f9b239aaf3b80939e164a74c11b2c118821c12bfe21fd56614ab9c61ebe8a5ca2ff94100923dc4f4fedadc17ff0536c8789a8b
+DIST gentoo-kernel-6.0.16-1.arm64.gpkg.tar 68874240 BLAKE2B 92b2c8375fd5bade6c26c0edc0d8f5956452c6d63a8256492494759ea66470a22167e7fa2147bfd1d3e335f3327e62fac512436b8898898e66d8ae9a26bbf951 SHA512 7d5ba441399ba1ac216567d936c462e0b94638367c23f58f869bcd1d49e7b16c75b52f422e12932d6f0fb653ee5f262bf00f1ff88abcd94a8ca7912426a80ef1
+DIST gentoo-kernel-6.0.16-1.ppc64le.gpkg.tar 62187520 BLAKE2B 2d53e0ce908b31fedb4532853463b2bdfffa928502c0906d2e7ae756a20c69fcbdabf2ca04199cb25deb67ded066594ca12288bd41e77ba04c57beac32d5ea10 SHA512 63e2436914e711caebb0f6af8a47870648c8c61b72f7d1e95e1e2ced9737a6e9a5ce24169c4035a4801c5223a19f7df6cbdadb8ce146261ddadf558f7ef433b0
+DIST gentoo-kernel-6.0.16-1.x86.gpkg.tar 65341440 BLAKE2B e4a82d72ec2a56e0ea521a2c72a5c43f8702a601f64e412ef38e57ceb341f0ab79c3cfdc46f2ae84f47a0427ce655600f7ad396b81aa256a73833adaf8cb1cd9 SHA512 453a64d19552f0ff6c5981b96d7ad85aafa7365896c664e65a158b1932bc94fe85b27fe542bf0fc38baa739dc05c3ee577e63eba5c82ea6ce459c7daa9589509
 DIST gentoo-kernel-6.1.1-1.amd64.gpkg.tar 76697600 BLAKE2B 77999e02b8fdf5b4071ece990aed1044557ca87ed2999a94017319094c708d87af7ccdc2d784782f9a950c52660fd2663b2b2d336e94a6b0e351de53e9b28d15 SHA512 26c99f5cb710273a6bea1160ba13a01eafba3e7f0f911cb358aaa9f97e6f570ed423152e9bf310aeeb761652652bedec961e8ff5cf9fc589cd41b29dde93d389
 DIST gentoo-kernel-6.1.1-1.arm64.gpkg.tar 69304320 BLAKE2B 2bf8beea4688e5618cc60342fc202ccd4ef5995495768de73276e078260054070d085923afb79e006204b6cdf4505afbfac1ca7c305cb907d63a110909dc52f7 SHA512 d9e6aacf0c861b2febfbb5f00993de78cb8d4bcf743f1b45243c18e19a6785bfc661d2554dccf717fb3df841127ee38a9879274d3ab9f4b29fdeb23f9e5d856f
 DIST gentoo-kernel-6.1.1-1.ppc64le.gpkg.tar 62709760 BLAKE2B 9339668dfadc464ed02b86b69a23d30f4a20ec4e5cb6932c50707db66ef8713b94f8e11a5af0bd110c698d9702030c1983da3acc939afa6eb439205c8cf09ab0 SHA512 6e7416e48a82a902b9fe0f6b642e73552964e6fd615a9e53efc9e2d5bc85d29f18f0fd71ba2b7da883fc431878f9503226676f1bd1c8d06cdad4558815eb7948

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