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

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

commit:     31ebae9a56acc8103dfcd6f6524bb0a0dd07254d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 02:20:19 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 02:20:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ebae9a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 30f7853775d9..b64904415fd0 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -52,6 +52,8 @@ DIST genpatches-6.1-26.base.tar.xz 1261204 BLAKE2B c8e9b6f12aa7611fbef190dbe5eed
 DIST genpatches-6.1-26.extras.tar.xz 3808 BLAKE2B 061dc90cf89ea3876aee7cf9533f33538134e186c6e7daa6dc45ca0efc671822d9b3c3b8868b54978800da24cd550e5433ef866bdaeeaaf326fc765c66a69f7b SHA512 fbd23f38483227af5149cec04cbc70d76f962a15517e85782d0d15e4f55be4d4946ce774a8eaf697483b5c1e047ae83a29988202d782ae9038b6d946d23515fc
 DIST genpatches-6.1-27.base.tar.xz 1321772 BLAKE2B 8d46e2a7c0023fdca7f30edf56f1504235dfb9f175393dbc4494f58c9fcb4402f0e744bf8f855baf66f3e71531efbf1ed9b2aac7a0143292c336efeaef665eda SHA512 4fc05627f050986dcae332bfae4c582d308f195393ae8cf00c1f32a73a42be0c7178eb5b7e0a4fdd996b203702535523e33b65972540b3a97da3dc1662c49f36
 DIST genpatches-6.1-27.extras.tar.xz 3812 BLAKE2B bd1f13817906296ceeb943a211abfab4dfec495734ca97031ac901c0b8a644e558d161d843e2e09810f2d39643adaf687ad2c7b5fad78167b7bbcedceeda0e94 SHA512 4d6d2bb3a722a1c82b324ab4924a1c2a6b6ea6afecff19f1ebaeb93c542efeb176130f938d7a613c4e11ef809ccd3abe0b4df8c358ce297b5662b36c3a06dc25
+DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B 126c74e7558efbfb104e97e993a70b628fe7882d756ef0ef29031b042651a8df3e2e940d31f85556453cd391358421594f9e089ed194e14b107932a8d525ddf2 SHA512 b033d8b873b0c8ebdd89b25dd25a814746b1debc0f0944da8fdc2ec9ed1da3d8d45816547119f7548ac30a91003c3c078a193875711d7839e4de71234192ac6d
+DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B 3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d SHA512 06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367
 DIST genpatches-6.2-10.base.tar.xz 477872 BLAKE2B e95784495c97ccdb838e9a9d206c372545b3b06e5bd58c29c30d14a6fd615fae205934c665ce018b58b0f53534e5d440240079489da5c26de64913c50456281a SHA512 6f3730dc20c6a700f403fd8a01e0cf0b5d871e10c415a808ce91c53fb43e0c636c9e2767eddbc61d52137675a2a620d0efc7c5b48b06906ccbdfbbac8c927bb1
 DIST genpatches-6.2-10.extras.tar.xz 3812 BLAKE2B f4a8c6c516e523bdd18ea881469ea19d8b5ab77b989ff79a71690cd321ae8c8f323801bb25f0861e1f648cd4162bdfff3a0858137fcfc20db6a2414088c8b994 SHA512 098b6c26dff1e420314cc9bf3e716d3c946b7f3ee8f2117744dd050d9a1cb266e4622d25b5d61990902dbec4e98ed46b991b10f15e43697ee61ffccbbf88f485
 DIST genpatches-6.2-11.base.tar.xz 543376 BLAKE2B d034518061bff5104d3659da0cccdb7c9a17cb1c158ba123192def3b5b9e7ac49a4cdc3a4f040bf1c2c785941a84a17b2aa051d0f6ae5e52b5f589233f1796ce SHA512 6a6bb723a981b9fe935763e496c50316349e5b2d3d2dda8638b5500a9b6b398009c038eb1a1806c39fd4057f72b95074e38d649c04a33cd22b7bc6a0b21e1797
@@ -172,6 +174,10 @@ DIST gentoo-kernel-6.1.23-1.amd64.gpkg.tar 76625920 BLAKE2B 2167bece1946b047e131
 DIST gentoo-kernel-6.1.23-1.arm64.gpkg.tar 69273600 BLAKE2B a69fa5b8c40159de133e0b931743cdbb7686ab47c481b52d202dd0ee226660c7be17af0389975b7db24a3357ca8c7dbf2e866ae45fec4f96fb89c29fba5ac2e2 SHA512 c7a5aafb6bb7fdab15b0ca4219b44177bb1bf73b2bc425d94a23a1256af464799efd1f27f06334389e9f55e7ce096335345a6d642b955f9349122cf869d283bd
 DIST gentoo-kernel-6.1.23-1.ppc64le.gpkg.tar 62709760 BLAKE2B 88edb3495634f4cfbaf4cd6837aba07cc62c72dbedf1d5e21a7b873ecc2406c892a17949acff5153122019b3cd8bce169636126f7a9bcfa9a1fbb0f7e59720a4 SHA512 e6c0b7af40413346e54e2be0f6d6871650f0203a4e2fe74bf0d061acf06dfe01ce38e6d6b315ecab9f0cbb761f275a5ee3f795295919e68508c958b97ecde7ec
 DIST gentoo-kernel-6.1.23-1.x86.gpkg.tar 65873920 BLAKE2B ccc1ed02d61a00b65085fd2dbabd5e0a9dfacf1c0d80f5584cb2639dfb889e69ea5c644222bde21adbcef20cd44056a5f45f2cd30f87f8208f34a5cc95b6dde0 SHA512 25fc406483917d20240df9b1d7e83c3301da61daf23693453bf1951f0c903d80ed3234dbbc07b59ac2d9690f67abd01350f25d8a4225e1bda655fb5db30a281a
+DIST gentoo-kernel-6.1.24-1.amd64.gpkg.tar 76666880 BLAKE2B 798d538c0877b7dfad58c090d923a966c68e582367dd9e922e028823d88c2b333a862f3f98e11af9cb3cc21dcc0651282f048a6845d741a5e5a15d6f52ec2ab0 SHA512 b1e7147f30b3786cc655c79784ff9bf570b994d09ed537aa0597c2edc2fbf245cc1faeebb727b80b9e2cfe7404294128602424a9cbe471832e31d5a7ee469b1c
+DIST gentoo-kernel-6.1.24-1.arm64.gpkg.tar 69294080 BLAKE2B 93de0b494daca195ea8b4fed646b82efcaefecbff4f6ee0e30aa94d1eefcb521fae0de6eb65ec3ce04da5f619b8b07cf2544b3e46176d5a45c5eb03fffd41d47 SHA512 3ed12ddf9c3b3b7afb60cb55cf4a0ce5beb1bb16719ade4134800d917acf472bb89b6ab38ceba6a19a14ca02e6c48abbe68e7b72673132171301265ef19f42ff
+DIST gentoo-kernel-6.1.24-1.ppc64le.gpkg.tar 62699520 BLAKE2B 150beeffbc6082aef7502f54ac860a1fbf4e77f4596e7bb6030d996ac4554c9be37a4476827005278af8aab031cb713fd9e2dedfa72175b3f43a52cf1dc98d01 SHA512 c1ce12017195ebd5314d3157e8d8ebe8c4ff323e9f2d4ac5add9b9eeca3cbd24a873d0a9d33f6edfd98aef41b66f4bca61de95dae1c9169be15d10031f7f2170
+DIST gentoo-kernel-6.1.24-1.x86.gpkg.tar 66048000 BLAKE2B 30cec8869bbe3219aad3538300c546143992849925975914212a2c81a84123d6af04f36fc254bba4e2bc13ae13ed400e9d03a5551834dc6b0afccbab340d6062 SHA512 63f1d12fedc01ee87a46be2ba64cd59c32dfbf2d1d32c684d747bc32d1337016c5104454ea3040beba7d97bdb3e5c6d425ed8f1b8af3e730a656d772d93d07e0
 DIST gentoo-kernel-6.2.10-1.amd64.gpkg.tar 82636800 BLAKE2B 6440affd0e251a896be87495f30e9646922a94184b0729e0126bbda082745de40284b2f0a84415918e12417e8825bf9d65ccdaf2d7160dc75672c532dc84b73e SHA512 e47a997c2146339cd02794a2b653bfbbc423bfb20e5ce2cb50278229cebced5f4dbf2e68c8d6201719154b57e43a5150017107274f14726b10c4602b53a66951
 DIST gentoo-kernel-6.2.10-1.arm64.gpkg.tar 71792640 BLAKE2B 63a0e205036ef45b1d661e8789cf311ac6de4c105e86d9bba93e062e2a8e8b0e15c7944b57c3230d584a870bc64400bee44a91b5e945c9b8f2ce37eff1148798 SHA512 055e64da90d7b97358656898aa9f718382da3006220ea96e4a9c769ff8c057926b17d35770d5145e83538d6cfe5a39fd6549a1d415e3516efe2cde71937adebe
 DIST gentoo-kernel-6.2.10-1.ppc64le.gpkg.tar 63907840 BLAKE2B b34e7d2d1ad6f95f04c492ddf3ff13be45c38ab53cff33dfa9d7d9685594d565f8e9a7346bb5116bc0065633738bb711c2bd052a2e88617a7f632b534bf7e0c2 SHA512 1d0288d6d838d3fa8c9802f2c9e5d519e6f464f537a90af54c195c16e7163aeddd34abdb8e3a36b50d34e5af762dd14d5aa6ed0de44459457fe712242aaaed74

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.24.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.24.ebuild
new file mode 100644
index 000000000000..27016e1b991a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.24.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##*.} + 4 ))
+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
+}