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

["Michał Górny" <mgorny@gentoo.org>]

commit:     decd746ea3ada29e44a438708b93a6dd8d778d99
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 16:22:07 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 19:36:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decd746e

sys-kernel/vanilla-kernel: Bump to 5.4.111

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index ce6c0ad469b..7a72550de1a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -52,3 +52,5 @@ DIST linux-5.4.109.tar.sign 991 BLAKE2B 6701f7e216c48473c77140a4845c07726bc5d649
 DIST linux-5.4.109.tar.xz 109086324 BLAKE2B 1c989bf67953ae03d1e6fabbf653058d070aeae1e2d10680c8ae3ef96e42d2d3f44d0a40374fe30c547a53118d37fe25632ae81cd4b497cb5fed8db5ee0eaf4d SHA512 9c41d52c9a76088f670e81aca5d5a62c7218ea496176ac92823594a99893e1948ec550ec7d3434a455de1f79981c3d5b80c8520c375dc50b23a972e0bbe3b78b
 DIST linux-5.4.110.tar.sign 991 BLAKE2B 7b867b443b04df37f66edb0b8b6a5455157905125265b634838e1337cb17347c085c8c43efceed4f017db288de42b39229479ec9eec18d1229b353e059aa338b SHA512 0af3e2e327515a563bfadfb94b99530bff38dbb2318046ed1198a24fd8ad5d26ca32a2b501dd40d4b22bc2801c310db65766d4a1df223aa6326fd84a2f893160
 DIST linux-5.4.110.tar.xz 109093812 BLAKE2B 41664c20aca4a53e94aa7fa475e10284a37bd81d823ae48e7179fe8cbe3dc1ab603c4d162b1335abd0d51d8eb830633d724a4ca8763b494aca41b0ee06895579 SHA512 5b9c2c62d26e24c248a6dbda7607e8a27d6f0d9e969a784efe3e42808c5d89794c61146c1c75728b18274414a0f54c295cd5852581235d324712df01cf6896d0
+DIST linux-5.4.111.tar.sign 991 BLAKE2B 00ea726e62ca8810210ad3be33b40f46cfcd3daeab510b0b16f4788c37e576a0018ddc1e2a280c32a3a574fa89bd929af25d7516efe5eead7dc90bd9c55da199 SHA512 185804fd5afc9cea54911d0228b79860a484d2c45c65e68545944d5818397f735352f0525506685b2f7671de669db3ad6ea5b3ca1f873e8b79b1641eeed7c848
+DIST linux-5.4.111.tar.xz 109087996 BLAKE2B 843f9a6a8413c2d8a2b0f32de704421ebf9200793c5413c51b7ee812fb19a58f79fee90e26b6fa946899487644e4558aff033009f4bba2f229e914542c759662 SHA512 ef17ac3a47e3d2189cea60310fda30d48b2505c399f9f23ec8be2f2787fdd404c8616eec8382bb9398de3e64d5771dd09a942a102796385634af4ba2bbc5f488

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