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

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

commit:     b354db2eceb047624f809c781a20ff29fdc4975c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 17:13:38 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 17:49:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b354db2e

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.8.6.ebuild                 | 161 +++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index c20126f700ca..05f46d488243 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.6-34.base.tar.xz 1827752 BLAKE2B ad39269523df3e740205d812d3911
 DIST genpatches-6.6-34.extras.tar.xz 3704 BLAKE2B 7e5ad01a7ef80cdce8a974ede1efe530278de1b551a173674910686860bd12b76b9569bbcdad57fc6c65cc28d9c62c84bbfa0297f4cea321f9ec9fcb14c0b809 SHA512 96d9b972f7bd5392320183cd21db573a22806841006354ee5a52f8c311ccff63805923178f9a6ce63baa432e87d972dfe1964326ab0ede4cce0a3a185db8fc54
 DIST genpatches-6.8-8.base.tar.xz 491508 BLAKE2B 856cbc5f02af4b2c7073e2342a9d8131145fc0e9098557fbafc62cb5f24ce3009bb1ca9332fd1d43368bfca8963fd3f734de646faae1c3f95cf670e7768a6f37 SHA512 0af92f11d273bd5a13e0bc3effa2e6700b1404ae82a8bdcdf8be8279bacc5a45deb504c8df4281bf143698137fbf474337f91eeedfc681c019f4cc3313dd0da8
 DIST genpatches-6.8-8.extras.tar.xz 3704 BLAKE2B 777b8ef344a84e3be85e65f8d0753ca7f2609e80ff80f9d460f9ba3c19f3fa19f975a199c2ea9b36901dcfd7cdeb8432653ff01db5da076336a8885fc4da982d SHA512 3fb1ed8a6b243a8c2f09aed66b5967df441e0ed4fc89dc9cb81b33561f8517f699787caf429bc173a1ee659912926a79d01603515c34fce43238525ef9cd8679
+DIST genpatches-6.8-9.base.tar.xz 531224 BLAKE2B b5036c400d8e9a1ed765d31f3a2d5a542ae25bd4cdcbfb46d27e0c0887051200a7546eed16a1c527760680615d1c7a589ec482ed6c9c3ad28a4df1a778da3fba SHA512 eb33dbaa61b01e6cf5c706f7f72180005bee77a353a3c2a53319768a01ca16743bdea997fd9d520b7d112f9ed483de7f9ef8fd16adfed0cd28d955d13ada8eb8
+DIST genpatches-6.8-9.extras.tar.xz 3704 BLAKE2B 204ffea55bce91b404e81fe383c7ea49c55f33d8e850876bd3e2cf39ea8162bb39a33f3ae2a8f98aa31d91055346776120661703c15c6408aa745f1b137379be SHA512 c8c4316a99bbf5c2443db62db6898a7e6b5a95c008ed769488a21b93d387649edf54c34d1c131e8a6ef7c5ea8db8a502afe868c47f70868d1ca15e901c309a63
 DIST gentoo-kernel-5.10.212-1.amd64.gpkg.tar 63252480 BLAKE2B 3ce492216591a8c99b136e3baa7588a412917ff84dba8db91eb9d25c314b109f83009d646ed95c08a8af7a429f8a746ed824f5e6db679777cb19cf07ccef095e SHA512 dd29113f7409ce3d71df2354cd015be6c4943e13a7ffdd1609367f418aceb3eb6aa1687f9bfed20796b230dec1ed27b7bfa4c00398d3b65fa6109dee790a136c
 DIST gentoo-kernel-5.10.212-1.arm64.gpkg.tar 56719360 BLAKE2B d51c72f1bbf54f579869cb40ee9eb9b352e5a8521f4cacc58bf42310545a3305c90d7a518a86cb5d14c509ebebadcfe9a30e6d89c18f31061b3f84159b3205ad SHA512 29803f672fba9c74b88121f19582dc86ee72992b5c5e7a37dc52e02e27cb47839bd5d2e53247cdb2073374e4468663b83a5f79bfb6f0a99131a79127026974ff
 DIST gentoo-kernel-5.10.212-1.ppc64le.gpkg.tar 52879360 BLAKE2B 44e42395f00747b601046facea7b134bb06ccd45cfb4c5e93b39e3dcc1468702077894f7f32cf4e167db20bcf4bfea97f76003debc2439e6c3f56a4ec41e8c62 SHA512 06f4c7dc25d4ed4536a5a25d8e7fdb418483ef4aa03b7184c51bb5664739f7aa71416957f9edaa9e85e396fb395c4637e720d55d3b10aed3837a8da8a14dfc1e
@@ -82,6 +84,10 @@ DIST gentoo-kernel-6.8.5-1.amd64.gpkg.tar 150824960 BLAKE2B 67f7dcd5f4309c992ffd
 DIST gentoo-kernel-6.8.5-2.arm64.gpkg.tar 122398720 BLAKE2B 79416da38a316b25f9df59b46832e21a076b9e529cc0976e9ca8d3f38ec1d448e78feadb4c20b3ff2087af5dd42e7976567697b4d7001bb1fb5efb2a3c008c0c SHA512 d1f3deb209b89762b6dbf11e571eec79c67c303cd6b7dca900b6c92aed93bbebbf91405c2ba70dde0de385f8ff7dfcb6b6574a289d59f440b9c6f24f8e736ed8
 DIST gentoo-kernel-6.8.5-2.ppc64le.gpkg.tar 66263040 BLAKE2B e4972fc108f9922ed5ae7721c4ecc8755d05ddf9f8d3c289a74d17f66ecd2e06c015ac51e7c43e5cfa203cff306623ae4db33f84fef2a70ea52e45d9639a9ced SHA512 505458ef22d5ea170eb4d02fdee9e64e18e81fa6605289030ff842c5d54deb06cef1d53bde86ff575e1a02376c515ce1daaaf51ecb8f237d57773d06e3f79dd0
 DIST gentoo-kernel-6.8.5-2.x86.gpkg.tar 70000640 BLAKE2B 961ce65f0a807616798d821d9b92f83cea8b755f21cd4bbbe0dd0e1f63079f2ef8b9a594acce985451992c85a38e337cc1dd512d7a3aa53d8682fd77a9a41358 SHA512 1b246b7a6dd9f5d62edc3dcced2008a222ce35fb96b2b41935bf353634f248ca45e5fae87189995c4e91a83ca19150ca00b87bccca9a48823ba64c0852d0d214
+DIST gentoo-kernel-6.8.6-1.amd64.gpkg.tar 150804480 BLAKE2B 65fae74556ac4af62dd243e4d58f2d773c3eb75b7fad52751aace7f372142d66144acc7bd28d49fc7930b910ac3d977da7ecbdeaa80f5c472a4a42aa43919e36 SHA512 b6da7a0e8df1b0432d047f0616e88c9fbf52be255760b9ef089568cf94e27ec401c21d39b66c0c5751c2bf908b724576d5ef1344ded6dfd2efcc57a18b4917fe
+DIST gentoo-kernel-6.8.6-1.arm64.gpkg.tar 122408960 BLAKE2B e52e995ddecefc4390fccaa8f8936a7f1dda0f11092aaad59db6707386b8fdf71c6c05faca84c5665e1cfcab2563122a9ee6be1d4f40ae3b908da6a0d704b434 SHA512 f616579f857028f9779c52f7d7286bf770ebbd034b95cb799f876804e376c72b9aea047ac1d3bb3c31c07fe9f1766eb9541427a9ec11cbf7098749135b40d005
+DIST gentoo-kernel-6.8.6-1.ppc64le.gpkg.tar 66252800 BLAKE2B 4c916cdb16741301318e54848a5e965629af769492fe3ae82f1de1c1d8c9a57d95aafc736c45418603a6d47b8a6946a0f2a5af850a507e9b47372ccce317dcac SHA512 2038e23097c26d90edc6a70d06c673d671fba3d81fc3f290b5ab13923db3cbc9a6bc806db71dfbb063f7c3846558d0019c0ea7ff9222a8751b3f55f081e2fcf8
+DIST gentoo-kernel-6.8.6-1.x86.gpkg.tar 70000640 BLAKE2B c901eadfba7fad48c47f9f77748ef56369a28b3b8ce2ab67a71b54fff8d0825e525316994e06bddf02023daef193809b0f9b0de1dd239d34a57c16d6e998a9b1 SHA512 569a3cafa5828bca8cd9dfa179cd4783d7718cdcd657798e864ac635f6fb33b58f109236a6e0abc375020067e90629289b527a2eae65e43e4d54731bebdc45ba
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.6.ebuild
new file mode 100644
index 000000000000..9a4e621d4db6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.8.6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+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/-2/-1}.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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	app-alternatives/bc
+	app-alternatives/lex
+	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="$(tc-getSTRIP)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# We need to extract the plain image for the test phase
+		# and USE=-generic-uki.
+		kernel-install_extract_from_uki linux "${uki}" "${image}"
+	fi
+
+	mkdir modprep || die
+	cp "${kernel_dir}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+	local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+	local uki="${image%/*}/uki.efi"
+	if [[ -s ${uki} ]]; then
+		# Keep the kernel image type we don't want out of install tree
+		# Replace back with placeholder
+		if use generic-uki; then
+			> "${image}" || die
+		else
+			> "${uki}" || die
+		fi
+	fi
+
+	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
+
+	# Update timestamps on all modules to ensure cleanup works correctly
+	# when switching USE=modules-compress.
+	find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+	# Modules were already stripped before signing
+	dostrip -x /lib/modules
+	kernel-install_compress_modules
+}