summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-02-13 08:31:15 +0100
committerUlrich Müller <ulm@gentoo.org>2019-02-15 20:56:36 +0100
commitcf5243d1f881c0086cf7fb08fb7cb65f417a31a5 (patch)
tree4b1460b9fada7240ffc6fa3b7ffb8ff8b8c27f65 /eclass
parentgnome-base/gnome-extra-apps-3.26: require tracker-2 things (diff)
downloadgentoo-cf5243d1f881c0086cf7fb08fb7cb65f417a31a5.tar.gz
gentoo-cf5243d1f881c0086cf7fb08fb7cb65f417a31a5.tar.bz2
gentoo-cf5243d1f881c0086cf7fb08fb7cb65f417a31a5.zip
kernel-2.eclass: Fix LICENSE for Linux 4.14 and later.
Starting with version 4.14, the whole firmware tree has been dropped from the kernel: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b38923a068c10fc36ca8f596d650d095ce390b85 Therefore including "linux-firmware" in LICENSE is no longer accurate. Closes: https://bugs.gentoo.org/677756 Reviewed-by: Mike Pagano <mpagano@gentoo.org> Reviewed-by: Alice Ferrazzi <alicef@gentoo.org> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kernel-2.eclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 48146b7284b..edbb4a8584d 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: kernel-2.eclass
@@ -624,8 +624,9 @@ if [[ ${ETYPE} == sources ]]; then
IUSE="${IUSE} deblob"
# Reflect that kernels contain firmware blobs unless otherwise
- # stripped
- LICENSE="${LICENSE} !deblob? ( linux-firmware )"
+ # stripped. Starting with version 4.14, the whole firmware
+ # tree has been dropped from the kernel.
+ kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )"
DEPEND+=" deblob? ( ${PYTHON_DEPS} )"
@@ -654,10 +655,10 @@ if [[ ${ETYPE} == sources ]]; then
${DEBLOB_URI}
${DEBLOB_CHECK_URI}
)"
- else
+ elif kernel_is lt 4 14; then
# We have no way to deblob older kernels, so just mark them as
# tainted with non-libre materials.
- LICENSE="${LICENSE} linux-firmware"
+ LICENSE+=" linux-firmware"
fi
fi