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

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

commit:     1a5b308479a00abec00a2c96df96c3ea46ff0d8e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:54:41 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 00:40:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5b3084

sys-kernel/vanilla-kernel: Bump to 5.4.78

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

 sys-kernel/vanilla-kernel/Manifest                 |   3 +
 .../vanilla-kernel/vanilla-kernel-5.4.78.ebuild    | 103 +++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 503221381a8..35bcd2c9f40 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,3 +1,4 @@
+DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123 SHA512 2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
 DIST kernel-aarch64-fedora.config.5.9.2 217893 BLAKE2B 03a36c1fe81a16b434cd94bad3984bf8984808b2e7092089f9a23a565c6d9bc8a512baa4e5754633783ef47feb6cc67010a0093f096e5a15db0f13aaaf6d6426 SHA512 ebe29150ae625cf2f285649984c27246ef85cc13f0b5d4e40dd3ef479489aaa09b6ee4aee859d6e4361dd7e7b4432db8aec077a099a25e90609b9eac2d42802d
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.9.2 201362 BLAKE2B 93e5dbbeec7761d777b8cf8795b38dd6a727f07c58176013dc5d18c60165af21c6e0e9140c7c7217fcc31f9b9a9c959be9d3ef0f853035986605fc513e7c70c1 SHA512 7bb41160333fa0f751c80ec9ad1e49ef991c26e05575a1e5fb41967bd984c91294629d91624eacbbdf2f307a28f9de8c994a9a7bef63cc933b0e13727dd33619
@@ -9,5 +10,7 @@ DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a5
 DIST linux-5.4.72.tar.xz 109606972 BLAKE2B 90dfea3370a78742c851d7c9ee21c6fe17204f6c6825f82ebef4bf9c23bb59ae62bafc71cd4bdccad151c6042a33c43df8449d10e93f71d41bdfe3006255b5ba SHA512 6f8b191732b1f73249f8d350500ade946f61309791b3c4021deec80e4781738141afd5e4a11d071d329ec792fc87ce2e6386e151417db0fbf344b6a5659bddf7
 DIST linux-5.4.77.tar.sign 989 BLAKE2B d79c13fa311bd79dd690673f6f75cc308c28aea15ffb5c91b22717cc9c538eb7980dcada74e811939ea440f6b9a4843f9259f9f7d5be9521af2fd52ea676dcad SHA512 c7df7e53d4e463c4c776f3996ce7856f34bc63f1c4e32c58f1518d33e784d496945e394c5488807e9d02e3f51aa21e45bdd12a9a2377ea3ab9ea779aeed1ee1f
 DIST linux-5.4.77.tar.xz 109619220 BLAKE2B a89f698636cb913574dda1be8794955c79ae6e221a05bd16afdf555a3a142679309b0c494912b0020bc59c315e0e793042bd504ff076cd910d36e62c943a4661 SHA512 f8501bac63b8d5d9d263eaebf6ab3d9a70a7c26fa39c186c31ce1936647bb08efb19bdbe4a8f2912c37616d370bbdd05bec395d6d818fad235c38832b9d9cb87
+DIST linux-5.4.78.tar.sign 989 BLAKE2B 3a4c7fd8492f09a2e2ccb3d06255090aa785f9c426a95781e04169d865a5ac6cc47a8280ff38f5e45b1e230615c35ea6db3f4ac06a7b946ed49182825ba34bfd SHA512 19eed99c70abb6bd31f89c679e1ae823e79fc881c9ba7b7e1ed8ff3c50bc898f26836fa775dda6e2f04981c51214f7b3777b6331c1483b8d7d90492f9450ed72
+DIST linux-5.4.78.tar.xz 109618256 BLAKE2B e856874995b363c91e3147d133b07072cd73abe02bf1eaf33a48129c1c596303519e0da598465c633ae2b5168ad3b52efb3a516fd8eba13a52d3666350ab9bf8 SHA512 76207a716caf8931b875095a4cecae85d0e8dac9ef675ec32019462211ee7b263dc0cacbcd06561dfdba0510566a0280fa6d2e10f35695cf4613f99f90755f32
 DIST linux-5.9.8.tar.sign 987 BLAKE2B bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8 SHA512 1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848
 DIST linux-5.9.8.tar.xz 115540828 BLAKE2B 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205 SHA512 063e853ccebe3e9422407dd4ed7f74a6202546761d4eb542035b3d71d0478efba9daa6eaeb1e2452c13d3093dd64729d9fd2df17945319b9535724d95be94a69

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
new file mode 100644
index 00000000000..9c5f2af87ff
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020 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.77-r1
+
+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 )"
+
+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"
+	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
+
+	local merge_configs=(
+		"${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[@]}"
+}