kernel-2.eclass: Fix LICENSE for Linux 4.14 and later.
authorUlrich Müller <ulm@gentoo.org>
Wed, 13 Feb 2019 07:31:15 +0000 (08:31 +0100)
committerUlrich Müller <ulm@gentoo.org>
Fri, 15 Feb 2019 19:56:36 +0000 (20:56 +0100)
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>
eclass/kernel-2.eclass

index 48146b7284b9647460c9235cadea99bf7e3e3f78..edbb4a8584d42a44ba86d211929a35b32fc2000f 100644 (file)
@@ -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