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

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

commit:     d7b969265abe1db7ae2a2a6a90582e7d4a12307a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 12:31:35 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 15:37:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b96926

sys-kernel/gentoo-kernel: Bump to 6.4.10

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.4.10.ebuild      | 147 +++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index a6d8ef8ca9f0..75ded313fdfb 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-6.4-10.base.tar.xz 568848 BLAKE2B d9f28beda8bd4f69e1e5d586e274df
 DIST genpatches-6.4-10.extras.tar.xz 3696 BLAKE2B fa0b8d593543f3624b1cff626e2cb2dc93ff0e88fd54ec71a7e467c716481420da7f361c1dd353e36111425a74f6632f1c491e618dec47fa4bc15c6a6d9e26bc SHA512 9dbfcd1d65daca0b56360290f0a6369fa007f32dde0f1a62657d1697fb50b84668e8a14c62efcfc3d12ba6a4a911731825df260421506639d2ba9b8764962e87
 DIST genpatches-6.4-11.base.tar.xz 587148 BLAKE2B 19d9f8e9778046dd558bdf21550f300e9c3c74faba6a8778d76e56490f379d615aacf14a930eaa57348638440fcfa6da17d5dd1a1d3020b5544ecac252ee7f08 SHA512 81c854057b1a0119cbae5116090298be72a1c30a0d2eab2cf4f0cc1d4f8476eeebe183401aaffaac92e83d2297d0fb707315254a5f5a77bfb3d8c953d04d448d
 DIST genpatches-6.4-11.extras.tar.xz 3700 BLAKE2B 69a7811e49827c3c521d9a7e022e4c3ad5a326b6f6de8ffad7ea790d04e8decef5fc7d3e46a696d3c9d48502e9773fab715217626e4497cbafa97364474e0d03 SHA512 921d956322db5bfd0ad4047ccf3c65db25047a3d39118e20622c060b512574aeb5612f2e762fbb3d301cbcd1847ffbc2690c22fa4ef7a1b96827b12f8831743c
+DIST genpatches-6.4-12.base.tar.xz 647340 BLAKE2B b0962b6a6b0c07aca1f27abe48e9a1e361b55b6e818d24077e989a231f44f6275b7c01b1c73303a1692fa812ee09766c58108c9efa6551263a7d117ccfddbe0d SHA512 f271fc0bc410d2faad9f08479027207ca6f1cefa0d615eb620e57fb3103d6b26ea5162c01e438ebfabb2f23b337a11c5088452e1a646bd4fb60ba464f3c5ce21
+DIST genpatches-6.4-12.extras.tar.xz 3696 BLAKE2B d5c97c078e4abe4df885f067dd2202332c607452ecba07e0797426186b7bc2fac2cf6d876a269fcd8d2b8f5a33c8f36b97cf080d61bcff58ba8247b3a5376ad0 SHA512 5fe6ba9e4b8efddb7d305fd58825080862628ccd45fafb729756592a31d1ac6cd27f62fe89270d1ac30d54b99a617e4f49c127a3752a10af493ee9df3b113002
 DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729 SHA512 6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0
 DIST genpatches-6.4-8.extras.tar.xz 3696 BLAKE2B e1d121a35ab69fac09e935317c18299817c65867fb7cf7a6810f560af913a254b411259a78b61c0a31518629ad33e13e53910fbd9701602c733016869106e088 SHA512 11240038d70202c53ee17763de3f60fcb5ae0dffc8cf005d324a7cd15a865313b9da2a3e74e184090b2d674ca1a1515a1db9f2efbff7a0f5361563fc7895e87a
 DIST genpatches-6.4-9.base.tar.xz 483840 BLAKE2B 8f2796524871d00030c870fcb167f36bce2a990a248533b7bf481506f03937fc69ee34cc5e2b8e3fc994c8fb40c54f23ce14c922f99b46c63e9da7e449a6cbcc SHA512 ea23db4aac99667ce2393d7f639043c6169f0f452aa882060d009ead9ffe9b763acd2a88495114b1a691dfa178f0a82fc0df8f89546e2bc292ca643f918691c0

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.10.ebuild
new file mode 100644
index 000000000000..38b5f48b2b81
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.10.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.4.3-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		sparc)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}