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

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

commit:     537f4fa7ace12d25231c9d99d8f7584fff5ef61d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 18:00:05 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 18:12:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537f4fa7

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3b7755f45145..0de727d09703 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.4-264.base.tar.xz 6232296 BLAKE2B 09955b4c773e8f945a83f24ba79d
 DIST genpatches-5.4-264.extras.tar.xz 1812 BLAKE2B 5fe283f8ae6572dfc1c156baa6574c1ff172e05772b3e74352f61af9c4165f02544c62c3378a42fa0cb4167daf59b4f2fd95092d9cb459efc44f3f18e695c03b SHA512 3fb7e314a03c4f370efb47e97699d74d8b8b3d562fc3619e8b71c7431168d30875d5bfdbb826c2bb5b72d4e752b28a2b0b2885bc336cf5470c5099b2804f04cc
 DIST genpatches-6.1-62.base.tar.xz 3593184 BLAKE2B b9ede84287025cfb00e4772aecef49bb1528e3d47a4bfba110dc019ea94ed6319db1831ee765a497150e410e0d66029317c9859e951672207664345750531d5f SHA512 e1f5c54758b001cb9c4be6fcf0e92ad95cfe213b32186be0160bf5980ce1c6a77150f26baf89bf5e23c10c9c96df6ae3b5d77e2d84a4b792a93bb968a600fe58
 DIST genpatches-6.1-62.extras.tar.xz 3812 BLAKE2B 2f642be1d81a2e94221c9c713b8df8994953dcbac4d612bdad2f8e7d64111e8dfa4d988c105eea7d926e7fe08ec7232499e9bd8b8e2a9fccebf78d62bde91c43 SHA512 e06d58f69e3055ff38af09061daf6d0571590136fd154dd2ef2dfaca93d151391315abb5d45e252db4acadffbc7a87124c4ee50b6fffd278ce63fac819c38d12
+DIST genpatches-6.1-63.base.tar.xz 3660676 BLAKE2B 6af8b23486d6458d06aadd6e3d72d36a768e17bfb1917c23744954746931af6747682f3ab3e8cc12040087d760b63067d7f1fb73355dd7cb1287f42e60019e06 SHA512 9552fbef812ed0cfd950d1606ecf62414886bc0f79b572ec27a58e1f9f80a4c872fa6d28aec6301fd0474d9168156092318aa84faa108668b0f6df1965d01a2c
+DIST genpatches-6.1-63.extras.tar.xz 3816 BLAKE2B 6a9badb695f9306720e1bcc2836f90c82b27ac9205b455e76d9a0d6898f3539eaa05b96824aafb650c7efa1d1f9698190fccc5d115581c2a29617ef5b4259433 SHA512 e5fc923760637bf27dcadd2e59a6822e39f7c2d81d89019ebdba8853081ae875a60f657f8d483cd71dc8dacec51151a7dd3c9a5c4a7822fe32b658bcbe668c56
 DIST genpatches-6.5-7.base.tar.xz 428224 BLAKE2B 9038c1beda5e3778508a29ccb0f906520f93a505f9a45f7050c47814eaf2e474d46e3cb8760dcf5a3bfbc504c5c133f8dcd8b55261a3d0c824cb374a42d98801 SHA512 89942e28ec1c594401a4ecfd6ba240e334356be0f1f35e48dd9abb1f4ffd122a044a76079f214c534a6acada0db4b735a8fa8face05feeeba82e2b51231c0472
 DIST genpatches-6.5-7.extras.tar.xz 3696 BLAKE2B 0cba288c1d1c753e5a317e87432dbdc2e711635cd074b1daac3b40af683da939981eaa40b8d4291ad59d4abb92aba5fc97be134524e02b1c2c29653382d7f402 SHA512 ea3bcaffbf58f981388c2021baeea809a35a1b270cff6a0613dce2da8ff8431886612d22073c7a8d6462d20eb1f27d0c0518164c14e4af96b9393bb6a1a038e4
 DIST genpatches-6.5-8.base.tar.xz 521272 BLAKE2B 31bdac516a0a3f82cbe2c95d9fb0162d7a2b9f3865487528e7b92cb2316f559be9754d4c4c697f29500425c13fd0bb743c69b89530b4d471249f1b322315dbcb SHA512 debb1b1e499b94e4139143df5b3f22663fb6a216850e3262f5aeb0ade760f1a026d00e33f874c920369e3da968a192574351f6d93fcba3eb6b76ec45f5382b90
@@ -32,6 +34,10 @@ DIST gentoo-kernel-6.1.55-1.amd64.gpkg.tar 72540160 BLAKE2B 8e7aa1fea0dad4480912
 DIST gentoo-kernel-6.1.55-1.arm64.gpkg.tar 65208320 BLAKE2B 81fe79b0906de31de8c85382271c5029ad3d685e4739a9c6018cea31745ca53e7133f30bd2ae5e83aff9b42edd2bacc04b9b2df01e2871e46ab174da2cfc91f1 SHA512 611a8de368c074ed90264d3be82654617ff2b33b8752d756492ce0cd6c2c441abf81ab2873337ef061b4dd43f3d4535680415970b184bd363017c2d01a8bf7b5
 DIST gentoo-kernel-6.1.55-1.ppc64le.gpkg.tar 59822080 BLAKE2B 87ab21283f2beafbe2ebee7052bce9d22daa3c81b17eec34e948e6eaa1dd777f32db98a6be9a6591fd04825399e277b5f5ae7d7c14bd86f556765571c3e94042 SHA512 686f926aa777decfcc2e86d739ba3fb817c444aeb15047106284881eeb77f2008000b4c65cc0d535f237b850a4335c70124e89fa58eeb5fe3f6eebd42eb4a288
 DIST gentoo-kernel-6.1.55-1.x86.gpkg.tar 61962240 BLAKE2B 10ac633366d6e0e31b392e0f6f654f1f5f0dc04bad1e97e5b29af00c4523adbefd95257aaf8fda395d924e6784a4bccdf26a424a6ad8d83b5127d22a8eee1293 SHA512 14bdf63a5731de0f01e0d3ccd339ccec36d551c60f8847ff318c73f464ee60ea3cdea5db62a0f52305243c0aa1e8420a97f8333cac77c399d58361c019b83583
+DIST gentoo-kernel-6.1.56-1.amd64.gpkg.tar 72509440 BLAKE2B 1bbd61cf4ec48dcb35919cc6299056f50aa1e635cb16848c3debefe4d602ec37fae8470f9ba2688f268121f05cdf8c3a55d6f28df200fff5ff55655d8769d39f SHA512 21dd0da2e6035b96f7bd4c6c27ac9f17d41db6facabcc84cc66503a9b1978a4150b332a38aa4942553e2a676d41af3bab6e7d004ca9f3564698e38618a551620
+DIST gentoo-kernel-6.1.56-1.arm64.gpkg.tar 65218560 BLAKE2B 5b6de63af448c1eadafb6374446c7bd4ed81899581990ccb8e55b66b7716bd3fcb97414b1930af29b1698fe0812ba4170acc1fa8ee842848f11ff7358cc4589a SHA512 145922c3457d04be8e4d6fdacfef0f2cef950eb92e33079f0213d3870f7fbd0ea28040abff5ca5ed3d722cb5f9b18865f9f65f28813a8d9bdea923023f87c163
+DIST gentoo-kernel-6.1.56-1.ppc64le.gpkg.tar 59822080 BLAKE2B 9af8b39695897d1120c284a0f6db54e81ca8cf2540fd98de2d8fc24743928d6dbc99b77e669c2315fe11768b83f587a3b085348af3212047566d1aec0eb80d58 SHA512 a6bf9ceb2e0da4c9c7e981a5f77d6bb9173f82817a969454581de96b07e549a3a059e2851fa336d7d37157583388d373e5dd6ee213e5037218cb5b2fac1df40e
+DIST gentoo-kernel-6.1.56-1.x86.gpkg.tar 61972480 BLAKE2B 75e1600b42b3efcc803519b1247272e4bdacd559f6e0ecefc1fa97723407f362034893aec3c84312c13b4a97b9cf187e52296039a11de9c3edfceb95b2c7b35d SHA512 09d02255f2ec52b2ef37721aa401821624fb24c6ebdd0dbc1dbb78b8ff544e41151614674a2698ed92ee65c5e90f813da19ff6e17c408f7a6a490bea3ff4045d
 DIST gentoo-kernel-6.5.5-1.amd64.gpkg.tar 83599360 BLAKE2B 1c0ef6277d6350f0253633ab959dc49a5f69c9428d4a3b0a949d67957a656726641fd346b72e77cc1869dbd6dc1d8c95e93112a966fc52d72c01fe2cf016ad1a SHA512 b2608c8f72549da0959301745c40b4c7476aec063cb4ccdfb0b92c6f7ce4ffae32b9489500319341b64bed60cfe4e5a0ff5dc067e90b0677138e1e0879db440d
 DIST gentoo-kernel-6.5.5-1.arm64.gpkg.tar 73185280 BLAKE2B 5701a49199f604b7fb53caee89b82ee0de7c3ab5b11831aad509b7005efd13f3939e7e07eb4ada497faa2e709f08e1de78f0cf824b95d9c56bede84cdc8ec63d SHA512 a2a53824afd4d5905c8b9549bb82b73b86fec7f264d2b2092da526a37c1516a8d727651eccb470f672a412c34f0a4afd29ad2d56d6db5d7cee68f2341840781a
 DIST gentoo-kernel-6.5.5-1.ppc64le.gpkg.tar 64471040 BLAKE2B 0a4acdfb4f2d272d1b818e048fae752e54fe748e607941d9877a3415c5f88ba8bddcf18db1e64cc2bb4081f1e5e3802fc8f08bcdc5c5a940a3a19af0cbf2a1ec SHA512 81c2fe480c6fedf99f4e6badb952a5b4b12a95cf2329303ce8b2199898025673c3d7c8fbcaa28d5c3042e9331df59d72a42d4bc89b58a3659ea261da29f95b9b

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.56.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.56.ebuild
new file mode 100644
index 000000000000..d2845437114c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.56.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##*.} + 7 ))
+BINPKG=${PF/-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
+}