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

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

commit:     528d20e5187249c84a18b368070633212c683bef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 15:52:43 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 16:30:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528d20e5

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index da35e8a2651a..612e5d1363ff 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05
 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 genpatches-6.1-4.base.tar.xz 350692 BLAKE2B e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808 SHA512 42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24
+DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c SHA512 a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d
 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
@@ -46,6 +48,10 @@ DIST gentoo-kernel-6.1.2-1.amd64.gpkg.tar 76748800 BLAKE2B a616f03ab7cfb9059f6d1
 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 gentoo-kernel-6.1.3-1.amd64.gpkg.tar 76759040 BLAKE2B 5214ac8f7c103078be9e10f45767cd88311fbb853b84647f4af15894d6e262b61b8d58dcb0d3d53da95eb25db00c10027648666b7cc8aaa5beff9b47095a3b6f SHA512 77b95862a63fddaeb3a7ad8fbf6bb621259aebf3f0b1b8fde2d1d08a7b5ab8dbd8343c429cd7176d12ef80f713e12452fcbe6faa13a7a28ae9c8d56196b488c4
+DIST gentoo-kernel-6.1.3-1.arm64.gpkg.tar 69304320 BLAKE2B 58b2d41b52883b5cbab05869e94e7aee98b142d10fec0fb8e43c079e3f345efe9911795428db91545e17f670f7069ac0c88983dc4d2d2e3a777d6f4369743341 SHA512 28b80476b35b79cb9074ba9f0e47c5a8f9b6476bd4c4a9382d19c505661f0c1348acf9640d4e657f8c9ce471903ab98132bd828bee9252861ff87a93455f9900
+DIST gentoo-kernel-6.1.3-1.ppc64le.gpkg.tar 62730240 BLAKE2B fa7af513a96bd722f47b8c22a8ff76c034e3d5181ea171ebd719ef2bae1e9dc173f5425dbe4d909b614406dfe62744d93e94bcc14f0a2ebf41dd83d26deb3844 SHA512 a972539e4dae44556352755f0f6c0698a2af89d43f102c64bd1a90ed33cf6def6fead36f026bc44d863c688a41f19806194b249cf1647a26f82716bff6c5d6e3
+DIST gentoo-kernel-6.1.3-1.x86.gpkg.tar 65966080 BLAKE2B 30b5dd6accaa62cd51275589ce692f6af102482f17493fe63952a3d5f860c69642cbace872943e94a84162f6c623089d85099783aede28ab8f2304cc1f376a32 SHA512 0eb880c0eeb6d7667af05ed2813d7b5eb4a39ff2fdf76ff8c48718b1a1997c053acfba9d2cf80dd2588a0ba667a4436a6521e5373a155dbd68e0286bd7958fce
 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.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.3.ebuild
new file mode 100644
index 000000000000..37a5c18539e9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.3.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##*.} + 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
+}