sys-kernel/gentoo-kernel: Bump to 6.1.61

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

2 files changed, 148 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e014e746a987..c86f88c5790f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.1-66.base.tar.xz 3766288 BLAKE2B 3cf0a62fbfcd492e5c16b4158bcf7
 DIST genpatches-6.1-66.extras.tar.xz 3816 BLAKE2B 8b2f2aa2f65d427c4ec39cdb988200d31d360f2ffde6f633838b0c3437c4efe8438e01ccd8e2de57d7f164c32d509e35a8be1ac4818841a7719a3cdce9e47717 SHA512 7f40e6153812cfe74de8ce376d4ae02868b6f246027cbce67e0714a139e60b4aa32743876c180f3b7b07e9b6fd07d2138e21ff5e6ced9571d29bf3e647b615c4
 DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
+DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8
+DIST genpatches-6.1-68.extras.tar.xz 3816 BLAKE2B 86fce6b028ed4c3b713cddfea42f56adf55e105c9defbb8f6a84bfe397f0163ee9759218c2b43bbe9f9f6838623816fd3c31887e5b05ac8e98235f01f750a4dd SHA512 23550c824e7f3a1507d1e124224f0c1f4b7bd3deb07750d392011d374352ee430acb84e55143f3bbaafb67f9ea28a6aabdee77ffe3a78d68691f30fefd4304cb
 DIST genpatches-6.5-10.base.tar.xz 631564 BLAKE2B 7a9fe483c7a6a040af5a1fc0fd99dd7d575a380240268bb61d68caf95613d53fac46edf6cb18633b6dd2e803c9360d3cc13f0160e6ccaf811ac8420f7dd30771 SHA512 506abb2a66c51e45ad3ebab0c3b921faaa890640c7236eed377aeb27dff9da552088ea8d8192b4f2e142c510c7d565a5c8431444fb39bd82948ec0e696c4b083
 DIST genpatches-6.5-10.extras.tar.xz 3704 BLAKE2B 4bfee3cf5f3af32c02f4df2b91437258a4bed38c4cd1fc8f8467020ffe1835ec86dee58a10d2e1775fdd6392c6a28552ea3a90ff5fd36504ed43cb7787ea7e5e SHA512 48589be11fcc969fd3f46475f8aa53047f191c5fec66918e84d178e14f531c209300808f7c2ddb479fb8409a344f205f59b72dd18b6d79d1ca924eab10f81f85
 DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild
new file mode 100644
index 000000000000..5eb6a81e331d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.61.ebuild
@@ -0,0 +1,146 @@
+# 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##*.} + 7 ))
+# 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=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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}