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

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

commit:     dd559f18734aa207bc02777adcc2b4cf9aa2de31
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 18:01:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 21:45:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd559f18

sys-kernel/gentoo-kernel: Bump to 6.1.116

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.116.ebuild     | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1ebf4ff8af34..6c5e658d868d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-124.base.tar.xz 6355616 BLAKE2B 8b912dfa6afd71b8d2cfd709aefb
 DIST genpatches-6.1-124.extras.tar.xz 4060 BLAKE2B 326344cb6b4df76db97f5666085d26a8907769b81bbd1016219f319b713c5d2e467c0c0641b1cf5bf7eea80c7d865544a1b6e77b432e002dc768f633d70c9941 SHA512 a440486dbce9c6b291a202200089b03669bcb7c5fd635350f4f2d8eea21d67c073ee7feeca95e62fe96673dd67c92632955a83e003cc49865aef6b84f67dbf48
 DIST genpatches-6.1-125.base.tar.xz 6398228 BLAKE2B d22a9c9792cd0118b14cb75e37ccd526ca83840ba6f67c6cf1a0d8354094092cc1fa1c089634a5d60f6170e46183cafbc58943bb6c09d7a8eca6b44ff08f412e SHA512 5d82330540e9919e3339fb26431f787ca338550dcf85c5a91e573d4e3197eb9999fd653673d60a453306930e2126ee375faae67f4a7ceee7bef8af48500f91a0
 DIST genpatches-6.1-125.extras.tar.xz 4060 BLAKE2B e3e479543a260ed1c7caf3d7faa8ce19b88a6f0f84e05b5ec306da5bc118e540d4fb7fe43a8240659b52d929f32ecd50d030280d4848be034c370d5d22adbbb4 SHA512 cca2043706427395dc7a70b92f102993ea1c9505820523486f3a57de718bd3fc4f94acd43b8c4bc4103e37fb5d341d61bc028381b589e021c894977dd8473ba8
+DIST genpatches-6.1-126.base.tar.xz 6431744 BLAKE2B 2396a656d5dc3fc93dba49ffd5cde65c901b3dff67b207aa56f3d518debd8890d930f0853e921bb1f0224725bf78384dee976cc254ba9ba57ea94de67af4566a SHA512 b62e1650be9b2bc1ff050fb216f2616ccb1748b0db4c3faab5cee25cd3c8fdd321c90d9d8d6533debeb7a56fa997c56a12ae42ffd9192db6d6d6b804ba30055e
+DIST genpatches-6.1-126.extras.tar.xz 4060 BLAKE2B 47bd1399a522dcf4df4b0a7614f92af4bd248862aa3ce68d2996791d3aa055e917df44e6b4acedb4aa45cf4c18fa435da4fb3f28ce1d28fa15e78dadf45aad39 SHA512 871d52af95cd400fc095849c0273571ec0878c646ca966d8c75f7dda19a6c39f2c1f862ec51bda565aa9be6395eb7f9092864147bef09a1bd83ab037922537a0
 DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B 80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae SHA512 02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3
 DIST genpatches-6.11-7.experimental.tar.xz 5996 BLAKE2B a7c9ebe2b82c3740bab6353ee4209f576b8fbfda2feb2ba936d7280ad7148c3f1b0089c103c96c9defe17c128839e0d49ed0546edcd9818fe62cd2156ffdfc1c SHA512 770c1a114ac5ff26ef19248afc8e826549f0ffef87e8ff39f3f2af1300bf8e86d60b076e10147afe6e2b9c23da021f4e8f6a05d108b08350608af0c63a2b6b8b
 DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B 073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd SHA512 0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.116.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.116.ebuild
new file mode 100644
index 000000000000..53a3f59c340b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.116.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g14
+
+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
+		arm | hppa | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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
+			;;
+		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[@]}"
+}