sys-kernel/gentoo-kernel: Bump to 6.1.31

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

2 files changed, 142 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d7adfe0ac640..fb195f80ce96 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.1-34.base.tar.xz 1760348 BLAKE2B 9a7672bf2f106e0df50997d746171
 DIST genpatches-6.1-34.extras.tar.xz 3808 BLAKE2B 9830d4850e5095ef0864df0aaa25a4549678fb76b22807abf61739b42b048455535aff7eaac16bad5d2cdb0cca65efd2e176a50f40a685250df0b75565fadc36 SHA512 13c8f7f596eeaa9b78be7aae7667a196e199fbb8d3cc045318dfdfe1ab340622fd0e958be09ed8608f9667231d6523685af1f03f4f2b52d78810885c0e9fe4a0
 DIST genpatches-6.1-35.base.tar.xz 1862704 BLAKE2B b6fb58876bf303e807a429d63c8a932798a73f95275ca1137ca672477d8004404f931e09e681c92202fda9083a44dd53dd0b93d1e503f2bd6e177c44a9c10425 SHA512 df18933b2dc32af5a0760c8419d0f69d2c221c4d12aa8c64ec7d38be8407930b79d507f5312d9e9d369a51a192196dd36a8b919e78c81d068f7ea5989be8c8a1
 DIST genpatches-6.1-35.extras.tar.xz 3812 BLAKE2B 3784c4bc551ad594a75de1f174112f80c2e805f5ab2f1fc20642162e72ad785c03ac7e90be19497b6826810d706e36b4f40396e45ba95a6a40f7ba296a3d2930 SHA512 4666ba408cfedbf2d6858fde80699c7d533cf24724598c2b719bed365021eebbad7eb1872008b1bca2f8da77ab31b20d56ead15d9c7d0cd6135f117510a87c89
+DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
+DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.2-19.base.tar.xz 1082064 BLAKE2B a25100f54e9775fb220e2debd088c2d9e822e0c8e80da51f34f2372e2b2ee9a09f64fde4ab63e7b53ff1b6c5c0022d52aa7fb6d023a234ef520b3566bf4055c7 SHA512 bae1c063f9e624ebd935681ec7323b7c4fadecff63c2f4cd21d13731a70b549a4128c59a03e282c502bfd9b631ca6ec876cc782a90f633003dff97fc05c95eae
 DIST genpatches-6.2-19.extras.tar.xz 3808 BLAKE2B cd58fa1bc082b4cc6f45e1d8332921f78ce4eb8356c6510c6df2eac06778695ec98e4f68b6608bb22b66486895340595c13a9b59ed5316b3a6a8d27e86a796a8 SHA512 b69b534b8398ea2cf8578dca763736c6ea071959c37f4c2fcc0ff5ea9f35cee2e88637567979211d242a04f2015fa3ba6765b5e2173a9ab90c69e5d67b02e9c3
 DIST genpatches-6.3-7.base.tar.xz 466812 BLAKE2B 830f25190bad0be6dbfd45ebc748bc5ef6075cb13466f6cec02ba075d1af98d8ed7285506746631bcea71dbab007290c5b86cc8970c02e5aad5bd37d92d4b9c0 SHA512 65d9ecb216c900aec0d265b849fb40f8c141bda2ea4150d93f24f84c33eedf67b8966ff50a4ef65b0a3ea0aeabacacbfab45203c73dc3e83c1f7758d54b8a2e6
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.31.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 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##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( 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
+			;;
+		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[@]}"
+}