sys-kernel/vanilla-kernel: Bump to 5.15.154

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 52e7b6dc1deb..1a32f2768573 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -39,6 +39,8 @@ DIST linux-5.15.152.tar.sign 993 BLAKE2B 4a0b53b0146b65848725ee4a5c92f828ff5bbe6
 DIST linux-5.15.152.tar.xz 126617668 BLAKE2B 792184b2fab63e907dd1353d96f0d25f9f64748d814dd0b68aeaf7c23b9bd25042801d04712a3748a58560c11c5d661136d6dee6d5bcf71cc549862a391dfc1b SHA512 b66d0c4e6f049011af332a1cacebdb10597c641d062488f12821e1aba0b922ea73f874d525670def3abaf43c153441ae88928cd76836ce4034370fefaf4a3e7e
 DIST linux-5.15.153.tar.sign 993 BLAKE2B 3ac0c9beece854d2659111c9217fb52948ece1d5ef67eb18db3acfee6924935a8f322c21c86e01c1a34ceb5c21e28eff02e7ffb829cb447b0729b3e2b5a7c6c3 SHA512 d7ff36a84b3501545a5e5691e9ec6d1bb26b0ff0c05ac553491b96e69c75aab38b2062ed968197dffe35c5aceb785eeb2120ef0ed7abca8925ab2a6536c0c808
 DIST linux-5.15.153.tar.xz 126611112 BLAKE2B ac69f991f7a943818e0475eeb0f70b7ba419e9c90cbdf06462417cc702b7ee7218d62954ba15ce319d42cbd7c9e0bafee5fed399adc6eb1adda01d401559d759 SHA512 894705908e743e85df9f235a729c8e0a180bd83fc095f63f2ea9c3d26322eedb0ffc7cd62c65957fca607c8b4f561629e48f6ed7777e15b77fefa8b20c4ec433
+DIST linux-5.15.154.tar.sign 993 BLAKE2B e963d49beec9e550305b55b1577cacd2defb178f4e93f7ff6c430cd8e2bc62efaefbb1e08a0579e14bef7978a5b6c4e14b1b47cfd964834ac6966f570a82e81f SHA512 498f5b3587facef41af61fe5d01b84679e48ac7af825142a31371b5041523c5c8304122025658eeb92dbc2e6bb5dc31cb40ab7a79a4a50e598f9b51ccb0d9559
+DIST linux-5.15.154.tar.xz 126637384 BLAKE2B 06a9c44f359f3fd6807e70f18fbac03bd82c8637a142c0b868223011a4afe0bbb56fc83c790442b96f2e55d7832f601b1f7d4f643a563d9ea27460971c4df7f4 SHA512 89da87654abc6397f03a30dc48983b73ba3e306b0682546e445d9706ebe88e19dccd94939ab58782391b131065ca0a01ebc5f327ad3009315d10f6286ea9b179
 DIST linux-6.1.81.tar.sign 989 BLAKE2B 29618761c2ccb8747ba3ad77ab378193ab63ad689ce7db0d55cf1e588307c54eb6f937d2c311faf94a1f2c94e69677154a38154515c532cc383b5a83ac491584 SHA512 7444ad331b208a6d4c9410ace57f3a5b5c1347f51f00040c33d0940f76530aa1f0fcca1eab72ec9e7bcdce552125fd8e0335aa8732b39566612df814e8da8188
 DIST linux-6.1.81.tar.xz 135100548 BLAKE2B 4fb34946ca03096cec357f0205b4c2c4a76279bce0b19e1c7644f370a0c301b05eab30ff2b272e43b41e808fd568d6e2df197535b84d25aa28c2af05a12677e5 SHA512 019eca1bdd822f1ed65f6f7f73ab101c7402d61e612c88cf9afe10eae96edca4a8839cd85f92b7062de62dbb8840898e668a40d2d8d8cda611d4dc533355052c
 DIST linux-6.1.82.tar.sign 989 BLAKE2B 830f273ac8d8cf3c8c97643ff00b9a61d6a3139e291a4761447d266109aa49e902bbed210b820c9260dc30d093ddb90be42a8c497fdd052ad5cfa2a658f3d7b4 SHA512 67b3ff8444226310bc756123c3dac935437e3a57059e464b7159b7b1815b8b993bf0d1464f02983f06525bfe3a12514c03b36eef10c537b7e64faf58ab56a366
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.154.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.154.ebuild
new file mode 100644
index 000000000000..13b57074926b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.154.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 verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g11
+
+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://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 )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/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[@]}"
+}