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

[Michał Górny]

commit:     fae1d3ab6e677bfee93f83a62f8ae3ad0e7d1e4d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 18:20:26 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 14 21:58:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae1d3ab

sys-kernel/vanilla-kernel: Bump to 5.4.119

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 8b895fd4b61..5a6c5b74e32 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,3 +28,5 @@ DIST linux-5.4.117.tar.sign 991 BLAKE2B 01a030b5f92245c0c439ae3c4af3e0e9a8b49b05
 DIST linux-5.4.117.tar.xz 109091180 BLAKE2B 09ace0bf30b3f698cdb85ac1e8d40048fc35ff00777e88a53de0bc0beb6f950288aea0d56f58ad8c3c3248396a9ea7307258247813e82a604135b4f84952ef52 SHA512 d59267ee93dba48de2690e600d90364864054dafce75887018bc265de424af652cf66afd043c8249fb0c28fec296f6a9dbab7d74736fb99feed1e28dd3ab7247
 DIST linux-5.4.118.tar.sign 991 BLAKE2B 3d284bb3578443a8cf5c57061b416d0cfc29aa99b6983d36e41732411726b876ef2cf6e9b1da756e7a67340203b24073e467c5564e3064dfaa9a05091a5fe116 SHA512 377f15219ce650c148226eddce93a47355dc2ab6235a28669a8db59b49be1e6b10bedfb804b1a7925050254cb6f15396681520d3be64a07c99801db76a9b3489
 DIST linux-5.4.118.tar.xz 109102936 BLAKE2B 1299add90283d0d982689f135aa053a77a6084e416366b5e408a6afac4e9fa2fb96f479eac0f580323a8ccbc2d5d4f47dd9302db37c9464c22c9d3e9a14bd6a5 SHA512 e2809a00e14c75b64d68d3bb7516f26c032f8f3b3927d2a28c8f1ade84b484d8f73c3b0753de253d8cba8877db9f15f386ff7da86e80e3794bac790d8d8423fa
+DIST linux-5.4.119.tar.sign 991 BLAKE2B 87cb81f41daca05095bb0d5d66c882028fb695aa7796e2d7c14f4b3ba257bb44bbaad07422a6937d94be314260ac0bc34fa6bca56a06f319bac3138fb3027c6b SHA512 0334f3fb638da34c0c98632c473fb340830623f52353ae3dd0ec084bc42426e0fdcd9d6e976eee51029c295f8b137aa64952dd96e7a387d6768abf97a07f2223
+DIST linux-5.4.119.tar.xz 109111856 BLAKE2B 33edeae110d1f4d4ee8c32d3d189df1b165c12a48e1cfae1eb706b5144231a49c342ab4412dfb34bd601a515a109541377349c9009cb981aa636c0aa133d4bd2 SHA512 bc04fea0ecafb2d34808d415d6b33df30097ce019858277a633213becfdfb0a5d908ad677b358d547354b901b616cbaccb34fa1f32bc136f0856aee8d2721119

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.119.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.119.ebuild
new file mode 100644
index 00000000000..e11e956ef1f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.119.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/dwarves )
+	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[@]}"
+}