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

[Michał Górny]

commit:     baaf54e0dc0dd94c58f52afbef22819cdf10be73
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 13:29:34 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 17:43:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baaf54e0

sys-kernel/vanilla-kernel: Bump to 5.4.212

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 68e674ea6b5e..acffeab9a3fc 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,3 +28,5 @@ DIST linux-5.19.6.tar.sign 989 BLAKE2B af1848224de41fea363df3d6ef1a3d923d242c232
 DIST linux-5.19.6.tar.xz 131649076 BLAKE2B dd6fba4d56d26923310426589b28c83f699a62b676a76257e0ac49bc85d30ffb24f7a66a20108dfc5bdaa1454fb0ece3f28c483b246d3778cff220de527ec4aa SHA512 b39707864c7cdc4290fc6f4ea545da1b6029eeea54d2bec88affdac9b0187e28ebbf99badbb974d5cf4ad854fbbecb98d7385d5bb6efc74e52a7d8dca146e82b
 DIST linux-5.4.211.tar.sign 991 BLAKE2B b8a72fc09b476ff8539eb9208b7164864822b501ca4b0478a7c32d3b6add1a37641905ff15e4043c897f734033eb8b3dfe1ee981c7f7e7664ca3b9f083083081 SHA512 50e50b7d028877b07fed0d39045d20da36017e5fb57fadd1b0554896e416446c20d5a30d0fcea25fe57f13869c8647029b0ae5b12bd1917eb6150c130069b55f
 DIST linux-5.4.211.tar.xz 112946912 BLAKE2B fd34cf8643768dad40e96ff12058bbfa6240d456b0f0d58a67d0e40c527b91c3571783ef0abdb2e36d6c6314cd1782e032b64cb1a5c8b7aa1d586e191df024ea SHA512 7da542bc6ae6f46c5ff235c09f2656c29465a71edf2a83f0a7ebc57c6eb14a0f7ef4bd0c25614f0b4e191f80e617517341e8b1f14bb6bdccb003beaaf888cb2d
+DIST linux-5.4.212.tar.sign 991 BLAKE2B e3520f3a479d9d0c580dae1bccc5a5ff2b510e29921a9cd19598d7f3145db0d831daadc0e424a33cc020a4c9afbd1dd254cad8d04a1ffb458b83c512994f7e98 SHA512 df7b3ac3774069b0d05a93741c8cd10e585abc418585b0a3581b16452e06c1ba04a1f2d2efbaa1a29abb53ad63c8baf70abc5897e85f5d4c288b26890b2454cf
+DIST linux-5.4.212.tar.xz 112925892 BLAKE2B cf40f25216089ab9b57bf0d24d6fe380cf8b2644dc9ab3d15040dc4ea7ef93a043ffc83a292e376eb23688305842f0803e11adbcf98fbc46929e0e6cf58c1438 SHA512 48686c93f62cee6de8d5cfec212244bbd37e0d2e5b869054c7d49840a6976b7fec26c4a15139f70f5c33d2f387492fe18a6558920cbcd139edb1d9aa1963a699

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.212.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.212.ebuild
new file mode 100644
index 000000000000..bffac7964798
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.212.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 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=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[@]}"
+}