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

["Sam James" <sam@gentoo.org>]

commit:     07ad067edb0ce3776d5b517df470efd9856149be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 19:37:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 03:06:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ad067e

sys-kernel/gentoo-kernel: Bump to 6.5.13

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index fc7cad16ace7..3e25fb113e99 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.5-13.base.tar.xz 741136 BLAKE2B 3e13a5bb6effb4005e2c1e604722cf
 DIST genpatches-6.5-13.extras.tar.xz 3704 BLAKE2B 9473c94b0d34075ba0652c672d7b0b732258a5c57d933b8782e8cf6d394143a2efece463d2692bd71dd0915ead6af1dbf2b10d7ed80eddebeede3a7619b7822b SHA512 489c266ef698bb03a8a7bd3fc552266b787f9036c473c003b7d20135e5e7ec9bc3f3c5caf443f702c6cb029d8d95c23a302a8c8171769b0fe44720da700dd8d7
 DIST genpatches-6.5-14.base.tar.xz 905872 BLAKE2B b8fff1e8a9a9c4d23e70597a7602c92017108d40b83f1c0411a00b5bb9bf2a41c31e7cdb0773c78bf40fe8cef131bb879ba80fe85c024b9725af7505ad87f8c6 SHA512 9166ab48252ea3cc7192aba8b2d4881ba608ec70f22e975477ad50f077c47ebd37993275b2927ca282a9fb1434479a56c82bbc26e4f8afee8b4e7c44e304dee0
 DIST genpatches-6.5-14.extras.tar.xz 3704 BLAKE2B 21b8a21e4c86bf6d49a6eead8db5baaf2d1c4aaffc8ce6afb23a66cb1b3cc124e864e982d0d2bcf8d3edfdbeb58db71bec3de701db40027b56720969eda3f314 SHA512 f2f3cb5dc4535167448c426d22d8d49205c1474b8faad880306a317bafb3e40052689bf25942f1537c5c9188a10095fea45f4e259ee06739e8913b70ba9f13e2
+DIST genpatches-6.5-15.base.tar.xz 1049440 BLAKE2B 642a12b693e6d9af8ffa3182336aa9ecb0924da610a19585b09b275c19a2cdef5e32454b7fd95f87b25d087f923c2020305fe0313e159ab609eb77343d3dc0c0 SHA512 4a0be3c3409f5e053044c06dacb627942050f66e2cc5200efa92661d71c8bd9d16663c7576fc4b63defa8f00b8cb34a24f70bf9ac5add6858205bbeede31e2d0
+DIST genpatches-6.5-15.extras.tar.xz 3704 BLAKE2B 5d477a5328c365422ec0cd920aaf29c2af00c647ae00d45aef9211874ab8a462a2190983d3105ef90951c08b7eef83b4fa8ea862ba2ce70851aaedfdcc4f7264 SHA512 2192254b7fae30828a4b19a2a80042f8b6ff18318a2035ea443a8394fe6551c52d421bdd4e2821aecc70425146543eafa0222cdc2254773e5e6f1d9b03c98aaf
 DIST genpatches-6.6-2.base.tar.xz 14616 BLAKE2B 3da38df6de90845f4ffdd61708573589973649c5d38082199994488d2679cfc70f954acdd1760a1b4a9162944f0bffc0443590956898b6d1fb79a363958c2859 SHA512 5abd3bf1d05e0e4331ebd2046d6f1e4f1091e25bc4d5624b78f6cc702dd14f6e11f6441bf12694500e96803909384420cf3b82148ae80c23a7f1c66b5bd2bb84
 DIST genpatches-6.6-2.extras.tar.xz 3704 BLAKE2B d236133d98bb12a2310894614452c4d293b082a8f42a26c502e26022432515e71791dbdba1ca25e62e5d4904b441bc86ab123915ace1606d1e28571e83f0e9a5 SHA512 3bc907ecd0bab38c21ba8703fd0b44a0f23c9ac3de36029764813d121f0e4f3da8299671ebc021bf501c7e6cd63b848bb80a14fcb601f02cf850a8bf3bb0d826
 DIST genpatches-6.6-3.base.tar.xz 214140 BLAKE2B 8004fed867cbb854c681834b0d297336189a638cf4b2f513e3f78fba469e0f385ac02ad7cfd752ec351da1aea7698576a7ae7001fd2872cd8124d4e664cba0c3 SHA512 1d6f276b145b7ebb6dbf9064319ae64050ff613f495fefaa973c06abfebce23f176ca00988918812ce81610044ab840cbf77f3b015c43754cf2c1b905a516dcd

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.13.ebuild
new file mode 100644
index 000000000000..8ee35da11de4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.5.13.ebuild
@@ -0,0 +1,149 @@
+# 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.5.8-gentoo
+GENTOO_CONFIG_VER=g10
+
+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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}