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

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

commit:     fd15415689664ba5a6d862442f108ef964b1493d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 15:01:03 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 15:05:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd154156

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 815126fcf2ca..ae45caf1223d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c
 DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B 020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8 SHA512 9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823
 DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B 65193574bdd8fdf4dc5d78af616729db4f8e5ed4ad6fa22baccbe27cd0518175fd02acc218074c709b86831eda460a99013b2444c1f6ed358f545a3133afdc00 SHA512 d8015efd3980cf82f499a813589affc8d7b6acdcf748c17c9b3a4b41730676443611d6375e517c633bdb8d2119b1cbfe50bd8984885fd97c29455f00078d64f7
 DIST genpatches-6.1-38.extras.tar.xz 3812 BLAKE2B 648c0054d5088b51d17e8b825153c7fcc7988d973811dcae7ccd64bcd78b4634d410aaa848b3cb31272eec552ad410c705388b8887603d94b6cf5a5170f7b36d SHA512 313a119b47d954ebef9dea3a48024a8d4e7f3b4b62de74f19acdb997ece3e198872fc3c50e10171687b07e8bbf85c5b7dfd80045ed7184460fda3c68c29e8b9e
+DIST genpatches-6.1-39.base.tar.xz 1991672 BLAKE2B 332dc85815f36c8d97a1d053732fabb029a55009edd98e4afc6487f50e2cfe6cb02db0e47a8518286260a9cf430c7113e79ee7cdde214e20c1828162c9dc5bd0 SHA512 02cbb9c6f1179ebe84804bc4ebad65030c0471af8b78f2417128c3cf41d3fdf2b944ce2fb6b2cee6e8427cba7ddd5694a7c851a82a2c46f02fc624bac3450930
+DIST genpatches-6.1-39.extras.tar.xz 3812 BLAKE2B f5f5b2820a14c40228ff46a76ef13323b7e3132bde16591e3d5dd5bff86aae5ee2b1e7ed890d88aaba374553fb22b0b09663df6f8da20f71ea6b0ba0d4bac4fe SHA512 556f0454983f6537d6fa8bec81df5b2eb94a4413111124c08aad7d0e050735eed69fbcf797c94873f5837325d99fdb24d0a2bc6bbaadee29e92637b46ca5849a
 DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
 DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-11.base.tar.xz 641372 BLAKE2B 4b2463552d359412969bc50e8c46aac52c23fe83deaff66eddacb48148921b4f88b019bd05b81f4ae2eb71710cad18613e5001dd4ab999d461f35cedc4c31409 SHA512 7632ff13835b971d44f582853cc54d539bde0ef1ca511ac179ff49143c1bae21e82da0048b6c45d36da5aefd92fa788b108e3f01d6fbf16534394ad7b143833d
@@ -78,6 +80,10 @@ DIST gentoo-kernel-6.1.33-1.amd64.gpkg.tar 76646400 BLAKE2B 592a8aa1ce5bd8c2729f
 DIST gentoo-kernel-6.1.33-1.arm64.gpkg.tar 69324800 BLAKE2B 9741047e82f8daefc57ecb8fc833ce12fe8136b80dc6ba5447f5edef0efc097d67647aeabc57cf75a0f19c3b68a1b1c3de19072b60ab775083382eaaaa64edaf SHA512 50fd848b94ad031421bc3a2b2b5cb292f1a6cb41167eda2f87d05a2367ce2fe1bdb6851b8f549ee2032e3275e6c1dcc02055027ae3416aa792253173f00b9def
 DIST gentoo-kernel-6.1.33-1.ppc64le.gpkg.tar 62709760 BLAKE2B dd90d935998769f1ea9cff0ebb039b610fe3836106e689e1440ec604bb3d6e121d1542fd2b26c4706f03b1933c036293e4d33ed4f9a0c498d1793031fd3959c0 SHA512 f4e0200215c7d47ca9bd7a4d1cf928543df0cfe291c92d77adea330bb46782d27603cb24cd8beefac5e3215a4311d6c85281697787951151e3917a5b75e35af2
 DIST gentoo-kernel-6.1.33-1.x86.gpkg.tar 66068480 BLAKE2B 57597b0d1a475ac61e8256bdce4a2084b2d1690083cc70b03e7b1d25a50522c3f8301fd1e3980d77507d7bb5c8f7d3106baa0cb52a186fc98264c8bfdd2c885a SHA512 1f6ff909360da05055bedcbfe1169d8b9cae9ed86b4fb8e7921cda148999b86f3dc4680d302dbac126a20839845b265953b593bc5719973775a99d8e25242656
+DIST gentoo-kernel-6.1.34-1.amd64.gpkg.tar 76697600 BLAKE2B 52d804b7d2d77d7c215e2e38364f3212e6bfa1047c370238a3f2b7db4a19417dd4315a9eb13940cdb85a24d7f56c27823a8520edac8053cad9c57841b7500fb1 SHA512 ab54a2f90f39c67457fb7e030156def1b50a4e45ac5c4b96b317fef063b4520dc53351a8b895a79076ffeae835b56e4af9a5ef140309d06c0594c4be68211da7
+DIST gentoo-kernel-6.1.34-1.arm64.gpkg.tar 69324800 BLAKE2B 1b3fe027a64d228a1e979cfc5f29e23efda7f146164ea741672f85b668353395e9af48a45304cef1b51a4a8e5a7f2cd0d80f1350c3b594a453170af3476e2efc SHA512 6d02852f7e3de5df9eff7f387bdb12de972e25a44bb9251f96a2da7a7705112d1e1bc2aaa34d306e98cfa470f8f310322347a4dc3d70d23c13ca0f167b57816e
+DIST gentoo-kernel-6.1.34-1.ppc64le.gpkg.tar 62730240 BLAKE2B 7678827b4e230c042419892af3a401356d2cdcd15bafc99a8fdea111301534fd21b54cac9996a2dbee20aed0603f5145f5338389da79915535f5e212e30b1605 SHA512 7ff369eb801fac516fb56f94ba1a2b5b03ebe97b2edb39106097a50d56cb01c278c047f229d894f1d14e426c715a414e64b512cb968b95aad59c6214aa6e649d
+DIST gentoo-kernel-6.1.34-1.x86.gpkg.tar 66068480 BLAKE2B 520acaa2574136fdd2d84cd90d1df940ea9bf2f301bfb91d7da7b47c2e037a654ec465b6144b81f9133bd337b362c2149e6f8f4cbec4b04d57a55f10cbab3981 SHA512 ccb7b4df0c32ad8c11f206ca5b1ba0da07815712951e2a869c449a31eb4efd1b536b6f34e64fdff2b0938900a654646f98f7444c2348f348156ec699d5ec0a65
 DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8ca6b5a742a006cc6c6a1fd57760ffe72fd124d1ea3dbbc9361fc1f7ac4f64c3feaa2b213372cf72515577ae381c7921389db3e10d96 SHA512 9785a27d50e95c3dd9385b928b9dbc1e1056fd7cf999b4e1f675fa3ee724663671d8bb9de74a63588927cc5b984bfeff927e3ea9a26b12ef2009c7574804e490
 DIST gentoo-kernel-6.3.5-1.arm64.gpkg.tar 72386560 BLAKE2B b089996536ad9ac90e5fd382a490041baa3f7e2f4deb8945f961f454e042ef701bfb7ccc8259acca4a0a77fd104c6f0bea0a447aa90ee523eb42a4ef7eae72ce SHA512 1c666d1f210a81b2a803da4c3eab2c8464373cbbbe7b67ea2e6d3fd8bb786a6d13ecd9ece3d4dc7cb0b7487a3aa0eacfb80f9368d0b07d42c9ea7c0338659a63
 DIST gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar 64286720 BLAKE2B edfa70df90d9efca3394776bb30711f51a2dfd925d49cc5310ea985112b8c37deb3658581eb381d4128154acec9a39c369f9425aabf448a6d9d6a53f6796efe3 SHA512 bb551d9a588e2b801b4ce8d5a65a34b9eed1b965ee0843bf83193dd1692473fba9e576d81fcfa69f63418b056d9784f5ccbf36b5ea742d4cbf1098d64ec0b3bd

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.34.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.34.ebuild
new file mode 100644
index 000000000000..623c8b8ab75f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.34.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 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##*.} + 5 ))
+BINPKG=${PF/-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
+}