sys-kernel/gentoo-kernel: Bump to 5.15.85

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

2 files changed, 133 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1beb02a72eec..fd74139f7383 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-87.base.tar.xz 3545732 BLAKE2B e69eb4d31984b65ea5e0c216d066
 DIST genpatches-5.15-87.extras.tar.xz 3936 BLAKE2B 05717f3f9ccb161a5076c6623f15465729ec898ab7a8fb4e611d07acaca96df6b890a3af0890dedf6acb06c7db148df625fafeca5099eb96e31ae981e00a23e3 SHA512 ddda9d1daf3f71a8aade12758db2d698b2230a20b3df059437fba02b499d2a90f2bb5a5c0796b1fdf842ff64e515193ac97aa324a4047bbcceaf4849eeca2674
 DIST genpatches-5.15-88.base.tar.xz 3548532 BLAKE2B 947258e9bb979febcca994f82b9ca18df494ac0d7db4664a96ccb4737ac71151f21070d30e4e5665c53d4c444bf06471590a14d17f83396809ee9013064db317 SHA512 e071daa0620c62e5ba273c6f5c4134f7c6f179b25a7dbc10e1f045b6becef1182e0f27620be0f03f32926d5c2109f7802335dea9caac1d576c47bf92c0532045
 DIST genpatches-5.15-88.extras.tar.xz 3932 BLAKE2B d504a1d8dc4510e870c34d5e355944d2e79646102ec04d5a268774e29ead5255ae6cd51f3de1b10992c8bfdfda3dc16379b3e6aebbb18bb528caa801551498a5 SHA512 85d01fff2ac04bb439ffb2a648d665358b5631f086db51b1ccadf31a8a74f94445c5942d6ac25676aefeb7a86f3286a8a7320fcc30bb092c212f2061d3143263
+DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
+DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
 DIST genpatches-5.4-232.base.tar.xz 5291236 BLAKE2B 9f80382d51bb96d5f3b62f9a6c35159360775df3092301638f36ff2bc13f8dcd2bc18816f76d7bab8e341bf956fbd198047cdfb6d020e0c419d431e0dfcf5754 SHA512 e3d6f7c08667dfd3f69d862f6057b8629916c13e1a0421c254aed0462c8725c3ddfd8a75433de1f893e050a9451299281d6d5df9a4d234644e92b2dee1004074
 DIST genpatches-5.4-232.extras.tar.xz 1812 BLAKE2B e2ad941ec37d92e646f7c5d8da34b0bacaf98fcc96da2f43a4257a1e9d40bd8b90965655b67bca2a986249d0971c9ab27f892be5e7bc6e9013f8d8143638cb38 SHA512 4cf015c2847d593177f842241e67aa8125d19fd163883fe553799c3b7af6dab4c2020462c6d348478a5b539e0425e6510749c537862a67f5f8e185594b6d9d59
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.85.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.85.ebuild
new file mode 100644
index 000000000000..1039b6b5f28e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.85.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 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##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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 )"
+
+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
+			;;
+		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[@]}"
+}