sys-kernel/vanilla-kernel: Bump to 5.15.54

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

2 files changed, 136 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index e45673b0a997..35d59e8e7d2b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,6 +25,8 @@ DIST linux-5.15.52.tar.sign 991 BLAKE2B 321a5eb8fd8cad2d14705ffdea3fc0ad5cc4618d
 DIST linux-5.15.52.tar.xz 126364084 BLAKE2B 9baf5b0182df91790716f3629a6e163cf87d8e9bde79350f30432e7446d2033de9d081f1693a758a3830a26c03a8bc13713394fd82457afde33ecfb9e353de2e SHA512 01852559b30b177ba350827b076dc58ecad020e63940482e694286ade3debe53919a4514338536f46da1aa4f89b671368a112a913a53a0352d033252bc6b2a1b
 DIST linux-5.15.53.tar.sign 991 BLAKE2B 4d890ec6f124577094dfa178fd64dcbb99ef7f07f3ab5bc6c5591c1a2304286ad8285b3d7bb405cb127b33f05a4bd2bb03d0e438f50c1fc466346e3530814a85 SHA512 e7206e9551b89b3aed1835d8e29832ad457d4c375ccd53c4306bd390d714a6a9329d4bb2f71bc2c2dc4bf932ada7131c5383f23a2d71c44b6a0a8365de7a9b7a
 DIST linux-5.15.53.tar.xz 126365736 BLAKE2B b07a628f944e8cc13cc3b3f4097f3578dd64aebc23dfe1b59b049f976e141699cf5ee8b809e9ca15bf087e1b0be4e7436f5e930d57f4a581a58f900f394a322e SHA512 7a147bec74a8c390e24f5d61b34ce6f20c3d0f363f45f0bddf11da35aee035648d3ec71fffde01d47b56c49547c3b33cb22e987830b0acec38a90d78cffe25f2
+DIST linux-5.15.54.tar.sign 991 BLAKE2B f8cd7c5ae125768ae5b62903f39cb4048aa9480b683a9ff845ce9f67fe8599f383b66375de9a7757ad4f4e0dc267d8bc370242bf1f5cf2a5c2db347a758cd639 SHA512 49836d1db244d11b12e5ca9a2189377ae941ba55c83ed44595631892f8a0af5dbcf10851e1541e68582b0cab5514b6667c0778f08a2d7be7495ab986494919ca
+DIST linux-5.15.54.tar.xz 126388816 BLAKE2B 19952126a0f7c2eb102545dddf1674b8b9abe2e57cbdc12bce8c148ba476e119fa34b9c03813a8613fc11d4822585597861f1470b1caaba6403040e58752ebf2 SHA512 9da760f36e355f952bc3864f15cfa5b1a29c584ea8a4a8c15d7c94ca86fb63a6ee50558f64e2a53364e18cc5d0e5651b8f9db47d659e4312e66d1e0acf19c142
 DIST linux-5.18.10.tar.sign 991 BLAKE2B 7ce361cbbd768cfbbda3744f8528a3b4115378029682efad4f0d785c156461ce17d012bdd149edeec56979f2b801d37f2c9f09c8610ce197a12fb2fae2c16af4 SHA512 4aae4d2bf37852ccada7709304b6e1f69447df961e947cf78c4d5914f610582958da28c6de2f9a51b9cb544d0addee241bb872d3fe4d50c0512f577a48ae30b5
 DIST linux-5.18.10.tar.xz 129830456 BLAKE2B 71e1d666f2238bdf4c6a10d83c234b02b46dfa67ffbf73eea904254ddd7ded9ad5d520ec4713933388956d2e538e32911f4c99e16c5e3d0c19cbff0fbe38012e SHA512 2140d9012fdc63979c6a737513da46ca59a58f4312e8a1b1cbf481088e03da4bc2eb04fe9cab7164339ef1fde8a2a8a6d5167896e45b061b04dba0ef7b1fb7bb
 DIST linux-5.18.9.tar.sign 989 BLAKE2B f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9 SHA512 c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.54.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.54.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.54.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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/mgorny/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=${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[@]}"
+}