commit:     541c609c3ca797e1ca3e4859c71d5e654af5256f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 17:55:57 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 19:52:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541c609c

sys-kernel/vanilla-kernel: Bump to 5.4.80

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.80.ebuild    | 103 +++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index b90df9372ae..aac693566d2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -15,6 +15,8 @@ DIST linux-5.4.78.tar.sign 989 BLAKE2B 
3a4c7fd8492f09a2e2ccb3d06255090aa785f9c42
 DIST linux-5.4.78.tar.xz 109618256 BLAKE2B 
e856874995b363c91e3147d133b07072cd73abe02bf1eaf33a48129c1c596303519e0da598465c633ae2b5168ad3b52efb3a516fd8eba13a52d3666350ab9bf8
 SHA512 
76207a716caf8931b875095a4cecae85d0e8dac9ef675ec32019462211ee7b263dc0cacbcd06561dfdba0510566a0280fa6d2e10f35695cf4613f99f90755f32
 DIST linux-5.4.79.tar.sign 989 BLAKE2B 
26a1fcf560cb14a68ecb57e32ab7d6eed0cd33082ad7bea8e3ffb56fd59938225875084caae1af1d746f3fe02c9946a4ba5597647fd5cefe2fd942e5780f21bf
 SHA512 
8208b2ca39a7cefe8ed812cc72fb12826929d11c27e0016059f5dee8985748fbf760857de676d406dbc62078977192747dbd0b168402741fbfe6eace42d6e7a2
 DIST linux-5.4.79.tar.xz 109628092 BLAKE2B 
b18636d55425207c572cfdf81d4b316ae2ea0054ca9d35bcddd46c17b16fba2e9f4776c57dd049296d4068669106ae15a9a19ed949b428dcab6d82e59117c477
 SHA512 
cb0ed9cb4b70b22d62c5faf607dc5ad1d338f75640e0ea6540bc508ee7803df572012a29cac50d1ccfc7ec9302416ae7b5451101b676ed789128370c9bad2470
+DIST linux-5.4.80.tar.sign 989 BLAKE2B 
7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e
 SHA512 
54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
+DIST linux-5.4.80.tar.xz 109626784 BLAKE2B 
b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc
 SHA512 
ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
 DIST linux-5.9.10.tar.sign 989 BLAKE2B 
28777305ef639cdeb41d76bd5db9212994a2a8d505b394b822f798937af43b946a4098477d1dce132a9caafc4b1009d7f3edac4a79b9eb45d66ff4bdfab69680
 SHA512 
a68c71883e0972e3cee877156b3dfdd5bc2ac6fee18d9da48c8355d2f19a8c2cf5bca2237f1806bdf0759c330f882331a581fbbf49fa2410f2a42e3cadfa5012
 DIST linux-5.9.10.tar.xz 115545932 BLAKE2B 
423d0e2fea39d54c9bbda532dce95f67c2736646b88515e72a3cea97842a25f4b2b4ef0aa2896d623bbc89eb6e8ca14f5b447030f190677601048816ae4a76e1
 SHA512 
f3f5195508affa84ccac30621c852b0dec42a227e2a3677a31b6fafcffdcf34964bf43cc96b08698faf319a1eead54f26638d7c70c20df31592e1c00ff00ae06
 DIST linux-5.9.8.tar.sign 987 BLAKE2B 
bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8
 SHA512 
1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848

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

Reply via email to