[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

[Michał Górny]

commit:     104ab6451aa7223d0b0e3115db7393fa5dadd833
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 10:12:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 14:29:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104ab645

sys-kernel/vanilla-kernel: Bump to 5.4.215

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.215.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 58cb3663d496..845e5f018378 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,3 +38,5 @@ DIST linux-5.4.213.tar.sign 991 BLAKE2B 5266f3850825ba2eb12b2dfd2d61c22550e55da2
 DIST linux-5.4.213.tar.xz 112947888 BLAKE2B 5419828bedfa781b7bbf30a9e8af6f87fae7d910beb30ee6c4b388544d7e82a50816de9b6a3ee0e5c33474f88885f5f1a4d7aa23c17c29558ed4e731be803dd5 SHA512 2e177440179e889776b8d8166ae6ef3173755ac64f127a370ace5f376ac1a1804c4683058272bf8fae5a02efc36d0e59cbbb2bd12cbccad2348b5ddec6a8798a
 DIST linux-5.4.214.tar.sign 991 BLAKE2B 5720b8540d928022d7899b368b67847568821f73ebc8c25f6b4ae4e800eccf0691751def073b3c61e57859fa43c9bb9729b7be7e859af768816a5baa87e147e1 SHA512 9ed8ac3be08941f2bdee3b8bab0b00f4f147fae1ec38c46d67fe3a034127d906ed642289d609646b19f0cbd91e159441f74638f5f8a33d1badcd027050cb4013
 DIST linux-5.4.214.tar.xz 112943292 BLAKE2B 5f20fa125e84bcfecb5403bb74766f16fed01996e7bdf1ebdd9860a7290984738631b3f986e20190dfe86ea7e484c5ff77d541e76b3b554fcb5a8d33e48e6e7b SHA512 2db274c54c3a66e7ce73d8bb5a5d06e9fe26c19d47d58206f1cf07036a212ddb8e0c0b8cbeb09e393ace0d858572977d2f7c297af0154c9021bcd283694f6a1b
+DIST linux-5.4.215.tar.sign 991 BLAKE2B eafcd50885b0888c019d57903c51de5af1cb4ef3585b2dd5387b4947fe08dc03ba6ffaab0ba16f2b6176cf22fc608059eec840314f1e52875da0b6d0c8e3b177 SHA512 a51d9a857f52bebbb707e962c7541b5f1f8728fd6c353c8852a2a644910cfe860264b884e28587e3b7d0b848aee5df4c2680a4870f2b27ea2edcd2f9d920a028
+DIST linux-5.4.215.tar.xz 112958164 BLAKE2B b5fb506c2982ef5d4f8d48a8a7a9c715ef47a55684222a33b77c5388169e3094cefb1384d0f16967cf45752e0442ef2c6a02b2f690a48654090c6e2840b61f07 SHA512 dc0d751b2b58ca63ad84df52e4a53fafce60c4ffb5ac7380d87eb89606b587de73b651cd246ef2c81b39136195b0022a441fd7984e6a3782b75e6ef6c632962e

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.215.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.215.ebuild
new file mode 100644
index 000000000000..ae90752d5ab5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.215.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=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/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.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 ~ppc ~x86"
+IUSE="debug"
+
+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
+
+	# 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
+			;;
+		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.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[@]}"
+}