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

[Michał Górny]

commit:     01e3624f8df9353069d61d7a44a4593f91058b8b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 13:05:38 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 16:45:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e3624f

sys-kernel/vanilla-kernel: Bump to 5.4.150

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a61eb3f7882..54e783a4b7f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -35,3 +35,5 @@ DIST linux-5.4.148.tar.sign 991 BLAKE2B 7e1956bb8e2f801374bd4a7247bf36f1153ddc4e
 DIST linux-5.4.148.tar.xz 109151568 BLAKE2B 67891fe744cef7a69ea992720256a88e1497a5b687e6f43aee8b3ffde7933e99c10ae5b42d954a6f56435677dcfe53f73f577601adfcf40381ae2209d662e942 SHA512 8793545e4ec419153f8a7c9f4b779cca2d5a2abaab8ccf5d482473282faf71284f6ec08fa195e40d01803d65c079a4f23fe1d95a01f966b7209015635f5e0d23
 DIST linux-5.4.149.tar.sign 991 BLAKE2B 879b5dc9582b207bcc3c7f596cd69b16b0aeae263e864b06afb45c5d72c5c80dcb70d5a4d6efde168d40ecb3f175defa3462c3b8704d473f500d636759452003 SHA512 7e6781e242a4726a5928130180206602bc6990bcd58d320a3ed7e0e83be356f3ce763c25b57283f274fc1a071a940747716dbed1db96eb9ee3cb600fff4bfbc0
 DIST linux-5.4.149.tar.xz 109157092 BLAKE2B ae84c14229bb8b60d6e471b9ec5d972c7b25ffc1ed50763d8c2a3b5862adfa1deab28a7cdbcb06741e61fa6b6217d2392855d3a7e84c9313a9d07bfba16e426c SHA512 74cab8eeb345da9842ad87ea92563c928cb91b94bd056a250adf5b07f68f2ab28bce2f09a80e9ba3b1b6833807350f01a7661066cb08015d814a6886cca46783
+DIST linux-5.4.150.tar.sign 991 BLAKE2B 6292a8c6bc16f62201d95a170e5df7b1edd9f33ee4274a3ebaf908cabcabee740e376f92eefbcf36efbbca6200682622a80f573cf7f872978d263d2dd44595eb SHA512 cf6925f0f9307ec7ebb4345c84a74fdf98102e0a3866dc997c765f7f836be5101ae34d0655a4c5c1c632182da962ea49389056358661763eeacb4ed5814a094c
+DIST linux-5.4.150.tar.xz 109155076 BLAKE2B e34c474778d2ba1a619551fdb6c81be01ed0d155ab447bfcbe497c2258637b939fc1dda7d7161d8782e38d8c84e9fc94043d62a43698258594fdd6cfea8ac79b SHA512 5f6cc5852cb1e881027b8724920dd03b96f3ce2a58353ada6f7cf5bb0bffb3a8d4ded708f50963074ff41236e8c0aeaa7f81df0ac8e4f1147a7c4a0160c2c543

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.150.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.150.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.150.ebuild
@@ -0,0 +1,108 @@
+# 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
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+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[@]}"
+}