sys-kernel/vanilla-kernel: Bump to 6.1.24

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

2 files changed, 139 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 225615e89280..2019dadf1020 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -82,6 +82,8 @@ DIST linux-6.1.22.tar.sign 989 BLAKE2B 348a8ded434193e27a884c5ba88611cb128a1d2a1
 DIST linux-6.1.22.tar.xz 134844516 BLAKE2B c9c286505f1d20ac76b8992d8e27c42d196be5e495d168049c5460f1992fbcffda470b66b47b1919dbd50e081f14251bca79d664db2cb607fea3f64f2e2b404a SHA512 9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f
 DIST linux-6.1.23.tar.sign 989 BLAKE2B 419f3bd6e476139813cb84fd8bca9ba57347940a6cc82d4442e1d634786e7edba4bbf56d66d35859279d183616daddc95876a1aba6ff266c2f40b6f29265c9d4 SHA512 0a954024d2ec979ee3ee6951793fea3f3a80f5d8edce3cede38ef28b96ea0c2f8a896c99d896c9d3bc35e43aca881985ceff02c681697bc3c1cc2a1494064146
 DIST linux-6.1.23.tar.xz 134868752 BLAKE2B 49e806ad62fda82dba900c008fe84bb977ddfb9a40ec46a8dafb0f7ebe77f767143a0d029747e24b088f75ac83bb3177ed33dfe10ed2e29b980e4287ea9b3351 SHA512 6b57cff7222e3c193f5b54f8381b18ee3f15544a8c8cd8c5c5eb5504044e2ade93744c0324bd275beecbcc1dc4ec650aed4a563ca575aae764b14c785584f661
+DIST linux-6.1.24.tar.sign 989 BLAKE2B bf2b7cbfad6063647456468fa6717affde0b101746565c296911d64cf78f5c3fa6d4356db44d331bbe7c0e8e42fa679e65f7df957a37ed4bb9a8683b5d8f41c2 SHA512 aa808bae49a938b5afde78fe6f5070eaafc479e085795d8a7a109791edbe3d49503ce42af839c2eaf9022d2ffdd43afeb36b28b79e8ed445c97c00d81c10840f
+DIST linux-6.1.24.tar.xz 134850360 BLAKE2B 2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0 SHA512 8dd946ae969e3a51d82f8c5383cb4af8ec457b5ad2174a09a39f86db9c3d5992b9c394652780ad6f31aa6a2d90a9768bf86fc9d15a63bb6bda1e1a031554d83a
 DIST linux-6.2.10.tar.sign 989 BLAKE2B 5e87f3049989c378759f28be42622fc880d211b68990bf0892f81137363d40abefc32ca2a3cbf27cc8b1ada5ede67e7c29f4a1c6f77af59a60f637454fc62c1e SHA512 98bd960221afb83db7ad59fc693a2cbcc1394db0affb0a459af2fddfcc6ee441eceac9d322f60abe91258d45f88c6cb55fc884803167f8c706e826f0b9f7db72
 DIST linux-6.2.10.tar.xz 136456416 BLAKE2B 3005c2644600e700892a6f20ed1e9f65b56b8891cabcf1acfe1432fb55aac86787f40fa7e197cf2519b8a8f5d737ed5638c7e1ab850b4694554a87be14b8a5cb SHA512 56e55c4339f381fa4b99f50c647fb0c2339b366126f56ec91aa6a41b64b0d2f4cac2f18a0fd7a9b984616c1009e285ed9e128129d45d134c7c01918f11a846b7
 DIST linux-6.2.11.tar.sign 989 BLAKE2B d70a33f76f212dd29e2ce816510fa6e9382714786cf1d4e01fb1e88f0a32b288200673368534cb3faca2cfb22a4362dfa5d6afb7b0c15498b0b99ee11f8ebec6 SHA512 59195fe16a854b0f23a000517f5ac872269c41b3320c48f586ec3c61be3a17124c3d1f109a2826cd3cee5fa01f262b6e9e521520a6efa581b08e983352f86ad4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.24.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.24.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.24.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# 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 from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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[@]}"
+}