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.

Bug: https://bugs.gentoo.org/677756
Reviewed-by: Mike Pagano <[email protected]>
Reviewed-by: Alice Ferrazzi <[email protected]>
Signed-off-by: Ulrich Müller <[email protected]>
---
 eclass/kernel-2.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 48146b7284b9..edbb4a8584d4 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
 
-- 
2.19.1

Attachment: signature.asc
Description: PGP signature

Reply via email to