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

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

commit:     bd0bfdce29b42b618bfadd7887aa6b78f53d5ea6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 17:23:16 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 17:25:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0bfdce

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index ef1483c21947..5753ff819f72 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1
 DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
 DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
 DIST genpatches-6.1-7.extras.tar.xz 3808 BLAKE2B 1640a94b258538c462e74f566b290e18a6c88a1993aad96e9442b40c498d8a8dd33b634816f53cd6ac39a1e95d9b0f9462d345970c706e3424ec6be8ff99d902 SHA512 e843e33fb1fefd0f3e0e426132ecf56dcc9702cca1d57cde74e4b43d414acc01e0334b3b1bf767391c2d1bbc4499d5e73508778b47ec849b256569392d77f84f
+DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
+DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST gentoo-kernel-5.10.161-1.amd64.gpkg.tar 66498560 BLAKE2B 6614aef018fd06c61edd76c8526a96d72f73225ce915fa8bebcf835bf1a92de5f3bbb6c9045cc2cf38c326b15d7d00b236a609b8dbd2f50296ae0563d0b01c58 SHA512 e370627c308d0f9ad1cd9972677a61d2dae152e8cb849dd772e3d1d60d3fb4ed195ae048705bed4bbb663c6532cb1465947a31ada825a3fa66e2aaf089acd115
 DIST gentoo-kernel-5.10.161-1.arm64.gpkg.tar 59658240 BLAKE2B e88ccc74dea87976843b87bd96ed1704d588e519913d4376cdbe80cded1e3a4370b9c3cf692e510732ef15505ab5497db1d5c5091b523457e644793b0dba6c0c SHA512 8f7648ecd4e99c3ebd8bf67f33924df60693cdad47f027c75b8a68bd3efae23defe9f1caee2f2604d58b931439d557ef263c98a6a6eb6171c7a2b8b91f2b1d60
 DIST gentoo-kernel-5.10.161-1.ppc64le.gpkg.tar 55050240 BLAKE2B 97a879d136891448fa86f598de5ebefe875bbd2b35c89ebd882b6913cf02a82de9981afdd25d758649aefcfd977edec2ca11d603271bdb17a76097b3333cb3e2 SHA512 2f5f0a2dd49caefcafe44ea8603f615be5487e1109e6aaee21553e6b4d9b516e8b0ddced4a85cdc355d363e9ddeb431b9c7c3fbc1806bec5d4bcfd36195c77c7
@@ -94,6 +96,10 @@ DIST gentoo-kernel-6.1.5-1.amd64.gpkg.tar 76728320 BLAKE2B 38810ab12d580ca28ffb0
 DIST gentoo-kernel-6.1.5-1.arm64.gpkg.tar 69304320 BLAKE2B 33e166cc84eb3204f804f77451e0caaa2306582bd097f8ac64d6a2838ea99358d36ddfbe5b8f3693f983192f75535261ad6800fa585c6940567a2756bbd3317c SHA512 0e777196bf654d125574f864145eb8765672c183038604adf9e327985a55815c732287d3595e1899d6b00629b758a2dfdc426c658927f69c0939247995ded77f
 DIST gentoo-kernel-6.1.5-1.ppc64le.gpkg.tar 62720000 BLAKE2B 1da226a56a8a2f0a49f1a597a472ed3b97e4a7a5c4b4b18922a613f01bcadf90005635c6224feb3e70b1f2543823ef99b3192ac8d53605a28736b54f63649ee0 SHA512 80755a351f65007123b3a2427d186fac8b24204c769580b810b9860f4d3531cd40b2be7006631371d4be9d959954537cd7dbf05344bc14b0d08ca4f9432a5484
 DIST gentoo-kernel-6.1.5-1.x86.gpkg.tar 65966080 BLAKE2B e7eb9f70e581f0feafb0edb6f82d6cc615c32ec8ffd3f9c735b7172e24f2ad81ed765c6c7cbdd7ea0a2916bf909108f0475b6d8b31e56fe15f49fa346a541a9c SHA512 4df6bedc4be616a4b347f1d35ba762dbe4cb489893a13ca22d0e392caf10514e4d96e60101014ae74a741eb80056e9d10be503a3cd1b46a0371e72f0da9c58c2
+DIST gentoo-kernel-6.1.6-1.amd64.gpkg.tar 76738560 BLAKE2B 24d6d3f29b4323d3ff080d05c14374f203c7086527402bdc042068e350df9ca596f0dbe07bd985c74326dde5652ca464ed093a9a0fd90ce98862dcc2dda9978e SHA512 26ed6dc543859a9b842e19e08cdd715e48143d7d3af76713fef0e18c12298432b601fbf2eda0c8fa01485492c97db37483634b694ff51cd5a00f2037867ad730
+DIST gentoo-kernel-6.1.6-1.arm64.gpkg.tar 69324800 BLAKE2B afbbd8f02b7127f95d9ca3e14e28d594716d17e472514886e83d4ac4a07e55aa6f1aa905a3328d55eab1b0857b6510ae9c5d2683a24f806136937ffa62e5fe35 SHA512 fcdd7700192661cd8b010389bef50c516f5f47e425c2122b3b2718a815c209ba5c64c54cc88c94dabe0968d65f5f52e8ebaca887ca1b3f741938dae8a384ebc5
+DIST gentoo-kernel-6.1.6-1.ppc64le.gpkg.tar 62730240 BLAKE2B 3a94df5fa51cb826a8501f12dc47deb77ea124ab59272bcb2d4506a137ffb26ef3f0c75d6efa10d08aece61064318642bf40257a7e3fef3766234725ec16e5c8 SHA512 24c267ff67fd980913ac7f7b494224ef46b0d102537ad89ba1a0e08f388a95fe9b4b817a0e9270a187c24d42d7b41f96a2c906079f9c06fb4fbbd8c5dab140f8
+DIST gentoo-kernel-6.1.6-1.x86.gpkg.tar 65976320 BLAKE2B f1eb2845fc24c35e5f922dd34181d732317ed8adb853816118c85baa8ff315a9d219b4296062341386c3bc283ac119e05753d3d723d92c206b527d34bb1dd6ba SHA512 4f59cf63d90fc8ad3d1bfa846a51e8218c52109de138e5b24ce91d6eb27c82e3e2f9417e74990e48571dc559639edf8ff5d742d5b4d67d31a804447cba184c53
 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.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

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