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

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

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

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index bf21b91717c4..505fe8a24d8c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
 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
+DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
 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
@@ -28,6 +30,10 @@ DIST gentoo-kernel-6.1.1-1.amd64.gpkg.tar 76697600 BLAKE2B 77999e02b8fdf5b4071ec
 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
 DIST gentoo-kernel-6.1.1-1.x86.gpkg.tar 65914880 BLAKE2B f7b6ca3bfa7c63c51fd3ac2678fcee76fe9649e3301d38a09c4f90ab6b9663c7bcf46b9c3ec6efb4319f4091f5526746d2e034d57887e826bf1d45f74d52e30d SHA512 433bcd0b29eb5688b27cf1649d9239df6807a76faaa7707b54f2b9185143ced429b897a026c2da01638746ebd56fcfb05b917bd015807cac8151559eb7814f8d
+DIST gentoo-kernel-6.1.2-1.amd64.gpkg.tar 76748800 BLAKE2B a616f03ab7cfb9059f6d1f1ab2ec3f4c31ba4fded8554adba58492723c32015c159a06d3a5794c80666520c8a4fc42858f7da181431ca6b1b8c8ee4a37c849cc SHA512 7a22e0f5acc12b433e245d01c466ebf44effc2bb8bb1a3403128648a1c1651674c7c075a82dbaf4f6834cb56d49bbe34e546ffdc97f464cc5d90cf250e5bba62
+DIST gentoo-kernel-6.1.2-1.arm64.gpkg.tar 69304320 BLAKE2B c9d23924cb2fcd6748241206b6181da10d139562161a738bc15341ab679b39b24d3a60d43a7e09b23aef7563bbdab117b90b97b0c059ff03e6e350109bb726d6 SHA512 36d116cd3fb6efc81014680fb6ae9e1ebd43618e17d3fe0bb4df022580b0bc526e9be3b8f86e2785983eb47db8cd1e983ce78cd960a8ce073402edf3b5e299f9
+DIST gentoo-kernel-6.1.2-1.ppc64le.gpkg.tar 62730240 BLAKE2B a3e5e85e3ac015b28667b6c090b5108edb4dcb9c37ea4048a056ac4ff2ef23466747882c3afa6ca5ad799b7a6856c68d8d2749a11f875a22b08f7df790aeb07a SHA512 7ab08ba8491c965c448ab7a1f395c2f8d90f26e84bdb91865551cd08c5453d6d83767656f91dee6f04da1f463377f51cb8c2cd333789b370391a29b649526988
+DIST gentoo-kernel-6.1.2-1.x86.gpkg.tar 65966080 BLAKE2B 05b6c2689808a257bf6d770e99066fa76d5fce909bb40a45cf99ffe7069dc70147246f0ce5e4a8a6858bb1ef35050f4b90e4a430be8372286bc0f690661b6bb2 SHA512 35502d64655e20b5a40f32a78cd240d7e2bce224139d8f50a12d05caa38aaebdb202761117dfbf057bc66bec0bd7e99c05cff3248526c2e25b03ffb4a64ccd2b
 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.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.2.ebuild
new file mode 100644
index 000000000000..08f0fc48296e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.2.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##*.} + 1 ))
+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
+}