sys-kernel/vanilla-kernel: Bump to 5.4.158

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

2 files changed, 103 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7bc9941bc83b..77e036f827b4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -49,3 +49,5 @@ DIST linux-5.4.156.tar.sign 991 BLAKE2B ea1fc6b0d4185e7b3c8358fee536031e5b3b80bd
 DIST linux-5.4.156.tar.xz 109177304 BLAKE2B 63d5a40f55ff5252cc49efbe5a31069049d1cc5ee3d4d901b996c0378ab01966514852694ad8b4f0a7c38abecec86e14a25b032bb24e7be0a1ac31eb76604db8 SHA512 3a5a9c658a883e68bb314a37078f3f0a4bca8d771bad3cfc72f92759cdca1795c9941ba2d58fc77d193873535796b361959fe9801ef74de63c8e93dc64a2658d
 DIST linux-5.4.157.tar.sign 991 BLAKE2B 9f1fcbc89fb288a5898fb61b6dc23563fb14464b3f794f7e54799263b0d21a3179e5fcdde945f78c59e9dbbea018c3b0a08929956cfbb9602921e6575bdb2158 SHA512 badd54cc13da10de1e6729c8307a0269f2856f10b1ace0f4ab6b7ade5eba6fb8983d33037a3213ff4caf5a2508290832a734ce5e967e2f9210ff151fc33f9ea2
 DIST linux-5.4.157.tar.xz 109178352 BLAKE2B 416f50450cef7d7f2aaeb45cc9be6d88ca63d66e616ffd26bff8b86a5fe7ef30eae007a1e861bbe376cf16b4ff80af7e76df585871eaec4d34d75d32d867edb4 SHA512 05c49649f59dc8c86dff63e430aedbd2e77c93eff7056974a672e2d4c9773454d8451223f9f80649837032913fd2aced8573ff413a424314c00dabfb36770cec
+DIST linux-5.4.158.tar.sign 991 BLAKE2B 533dbce299037f4b4fdb79a8562cad9d05ce4027b15ab0611d7901929051c333555caf4eefd621d28b8daf1101df9f557c47bb06c65701a880f0ab55b5226e0d SHA512 4bd5618db8dbbfe5c8f3810c9afd48b019bdb5ad10fa8e63e5ffd6f25558dae52475ac36444407b5350f7bd88bb307a3fa84abf594aa098a7f4e049d672f49e7
+DIST linux-5.4.158.tar.xz 109178500 BLAKE2B 2f17825064e6dd718b3ed71014c9442fa4970066b496a81b059a8f84d22d1c5522569aa672ce08597a56150eff6315f19e7d0eb56eccdd8d9505f1cd1f6ad901 SHA512 ccbf29c70315055ec7f63eb29262970c68162f2e12046cb45ec17aacf0950e0ed8e60a236744f2fdbd4fe5a0b14e62cdbbb345c32b089e5172feb5e170faa14d
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.158.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.158.ebuild
new file mode 100644
index 000000000000..765b04d5024b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.158.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+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/v${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.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/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
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}