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

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

commit:     153f9c0184bb87c1276a47a449248c5bf5e3e5ba
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 19:30:02 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:58:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9c01

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f0f7367fd8a6..5912f12a53ef 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a2
 DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
 DIST genpatches-6.1-24.base.tar.xz 1155780 BLAKE2B e6be4766ec5aba82d12d5209c1ac86b013482c2c1d40a9d5f72afa0f86555816c859795db9fa229415dc813e8b35851c98f11d17884d3e928684827b6c434778 SHA512 5e0c17ed36ccfe2d926e835a74b283ad40a21fdab33220c82c9e87ec2cbe17c3e6cc356bb62e17a1ca12901bd56694819708af438725c67b68c142c64f0a938c
 DIST genpatches-6.1-24.extras.tar.xz 3808 BLAKE2B 31803bf14b9c85373217e5b25fec9c401103b7ac996da14ddf03c69331b6073d6aab4c5c85241454fed43b559cdc6ce1be09c0a61315e79e9482907253e5fe4e SHA512 d5035bb0d8e99597e61a8939842a765e592db6133e923985268bfd7f69c512f5ed2cbf97c7372934794e103309c3649b3da11cbd26d4ba19464fdfc96f3759b4
+DIST genpatches-6.1-25.base.tar.xz 1200876 BLAKE2B 7050f6e95a28f5886cce9b53823f6219a22a5b23cad5471bfa9e83eca208b8369395075e9aabdbe4d33b53b8c01aff3d3d0886115850e327baf12a946b851e1d SHA512 ea30e0d44ab64a2aa36ad7a83cf2df7924ba5e699c92268bc5f3d54acadefc9c836a00e7e27cc02400a6751ffe1c3cd45e6b9891a3fc0aa8d23ad8e535f18e4c
+DIST genpatches-6.1-25.extras.tar.xz 3812 BLAKE2B f73698c57031c9d7f5edd9ba2b865e32064c38b528649a8144f856bacf35ae3570d1fc936ee25a88bd52fd0765fff05bec42686b8b3fc5566df187bd57d59be5 SHA512 ac2bdccbc6bd1de82cbdfe4edac978e068445b8e064bcc6a833b04f15b86592304c19651884dc0769719ade1b220c8c0f704beca240ce24ab370621ad6849aee
 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-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
@@ -100,6 +102,10 @@ DIST gentoo-kernel-6.1.20-1.amd64.gpkg.tar 76656640 BLAKE2B 4c4a3cb54d6cbc4576b7
 DIST gentoo-kernel-6.1.20-1.arm64.gpkg.tar 69294080 BLAKE2B 474e147b0e42854e742956b474e13825ea667b3b98abd1eb3f87a038c2a9c9c9449b3e4b06a4cfe6a5318e7a0e85c340e5f373c70d3a92ce663f8fa8a7178b8e SHA512 ff7afedd909fd0c0652a4f42f3d72b5d35c64edba592669437d30f63839cfa8f95706289ea82de585b41b08fa2f47613a33f4b491b265bc7013bc428cf228f68
 DIST gentoo-kernel-6.1.20-1.ppc64le.gpkg.tar 62679040 BLAKE2B 08df3b9613477efc2623544d27f473d5a2bb9fe62f769ce1dba3b5525873b7f00030f1324fc5c78a6cbaf8f4984a1f55004c753a540e8f5aee5b9e70cf2db6cc SHA512 94fa1b6d4b3046053d28fd79d8074ed0ba18c84944424c276d00a72ba83144d41c0ad6023f367be6b05067fa8b38f22eff5db90b7930883cdd6f430b028a2b0e
 DIST gentoo-kernel-6.1.20-1.x86.gpkg.tar 65863680 BLAKE2B fcb2ea60541f3f9d1dde5f4f6738b3d81adb167f4aa79d47677d112ddd452200c1c0319bc39d9017d836e166ce19e7fca182ec5d2eb86f8d0cf604ece5f9931f SHA512 2f3deb92d791a888df6620c567d73ceb913a0b3cbea9d48de661277e253d814a0774c51d2df88349434df4b8a33ea94755b198c19e2a6258972874c500e62c5d
+DIST gentoo-kernel-6.1.21-1.amd64.gpkg.tar 76646400 BLAKE2B b01badaf64dd1e9bf73c830904760b6a3e3710486162f3c1971c4a002fdf92c4b8319addce49e13297af622ed20b2244f203b165ea9ced11e8cda47ec9d5cb5f SHA512 d059432cb7c7ecd2f5834d4dd24c404a0db60b76aebc4dcd7f71ecf133bd2f07daaae8f035f65a0b3ec65c140deb2cfa3040c74ec0bf0f104a4c7a9c9b2c089a
+DIST gentoo-kernel-6.1.21-1.arm64.gpkg.tar 69294080 BLAKE2B 034da34a792e767d6a8c9c38b44de67635f57d5716f0da94b941916bc86d6d83e767fb4bee5877b168107a6c00e19f4e85080f5ddba1c8167f5315afed8dc036 SHA512 1cf1b04d0fba8849caea4da80c55183dfc9ddce5f4661832942fed9704a464c59a9ca1967e43922cae79e7573be0d4038ea40fa2ab930e4af1092ee3907f6004
+DIST gentoo-kernel-6.1.21-1.ppc64le.gpkg.tar 62679040 BLAKE2B 790af282f674e90a8f241c9f385adf024d86a4cd65b8706920ef425c51d1af30671443ac653c5fc065c204b387c02c76e95b03df65140ddc76068375fd0cf6c0 SHA512 fc5a7d86dc362f02745cb0fb136c9bd0390f4f9ad6c8ab8d3a4c10fc5420601c6cad970ac3bfaba1f97a814fa756d95ca7eef2082b826f3609351c647026787f
+DIST gentoo-kernel-6.1.21-1.x86.gpkg.tar 65873920 BLAKE2B 9e33c848c3274bc51a55d78e22609b61eafafa726f67d2fbe20dcaf4c7b43b90c65e835e7ed5d2e5b2559002b45a4dd93e9dadf1ba87cb6f1ea640d9f0996eb9 SHA512 feafa3622207231444e6080b1fd572c57a1ad84e1c634cbae83768da2d5d1eb30ba549c131e4cf40b060c15e349f8db1f31aeba3459e7d0b71aee42e889b1724
 DIST gentoo-kernel-6.2.6-1.amd64.gpkg.tar 82411520 BLAKE2B 81b3141ffff9af51265d94e5fba03365f0ad203e00b1cf5d609caf6c7fc04717cc8d4530cfbd0db5cf811473c5e4fc4ae6af51e54bac46d4a55d5aa965baf826 SHA512 c5ad329e56bf1151effed1289a65646f83e116f545934a08757358451f94462177e8c0a7eaefed86ef9ff3ae8ab1e842f77174ebf4d92f4e9fa0c6ee407ba8c4
 DIST gentoo-kernel-6.2.6-1.arm64.gpkg.tar 71628800 BLAKE2B 12bf704c287aa5854d6952fd1945325174b9353bc8a5235d557fc22af6d0601836a3f86895d8ad3aa956594664628555583fdd54c8f0a7bf9367ebc8ca09ab46 SHA512 313a4122005a9e77509e9ff7bce97f32b31c3baebf6fea0e1c52ea131ed44242392b237b33dc9334f8307185c959a6bae4f22c673ab5d212b2f21fe693627d77
 DIST gentoo-kernel-6.2.6-1.ppc64le.gpkg.tar 63744000 BLAKE2B 81b079534ee172c8710c0177b595bbca8a9d5d48b7297ea6e3111ddfd7d55b4887591a1848a9f831414c317465337131e5fc12d7f9570b8f31c16c137bc566b9 SHA512 d8e7d7dbc1243054fd7e5a3501e74b93f49ebe5577501a41f329f87d8cd743e78c5a7894eb746bb5f3bf1efff1825ab81840e720a01ecc21c7e87cda9deeee7e

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.21.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.21.ebuild
new file mode 100644
index 000000000000..d46d51864fd9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.21.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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
+}