| 1 |
commit: cf5243d1f881c0086cf7fb08fb7cb65f417a31a5 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 13 07:31:15 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 15 19:56:36 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5243d1 |
| 7 |
|
| 8 |
kernel-2.eclass: Fix LICENSE for Linux 4.14 and later. |
| 9 |
|
| 10 |
Starting with version 4.14, the whole firmware tree has been dropped |
| 11 |
from the kernel: |
| 12 |
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b38923a068c10fc36ca8f596d650d095ce390b85 |
| 13 |
Therefore including "linux-firmware" in LICENSE is no longer accurate. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/677756 |
| 16 |
Reviewed-by: Mike Pagano <mpagano <AT> gentoo.org> |
| 17 |
Reviewed-by: Alice Ferrazzi <alicef <AT> gentoo.org> |
| 18 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 19 |
|
| 20 |
eclass/kernel-2.eclass | 11 ++++++----- |
| 21 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 22 |
|
| 23 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 24 |
index 48146b7284b..edbb4a8584d 100644 |
| 25 |
--- a/eclass/kernel-2.eclass |
| 26 |
+++ b/eclass/kernel-2.eclass |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2018 Gentoo Foundation |
| 29 |
+# Copyright 1999-2019 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
# @ECLASS: kernel-2.eclass |
| 33 |
@@ -624,8 +624,9 @@ if [[ ${ETYPE} == sources ]]; then |
| 34 |
IUSE="${IUSE} deblob" |
| 35 |
|
| 36 |
# Reflect that kernels contain firmware blobs unless otherwise |
| 37 |
- # stripped |
| 38 |
- LICENSE="${LICENSE} !deblob? ( linux-firmware )" |
| 39 |
+ # stripped. Starting with version 4.14, the whole firmware |
| 40 |
+ # tree has been dropped from the kernel. |
| 41 |
+ kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )" |
| 42 |
|
| 43 |
DEPEND+=" deblob? ( ${PYTHON_DEPS} )" |
| 44 |
|
| 45 |
@@ -654,10 +655,10 @@ if [[ ${ETYPE} == sources ]]; then |
| 46 |
${DEBLOB_URI} |
| 47 |
${DEBLOB_CHECK_URI} |
| 48 |
)" |
| 49 |
- else |
| 50 |
+ elif kernel_is lt 4 14; then |
| 51 |
# We have no way to deblob older kernels, so just mark them as |
| 52 |
# tainted with non-libre materials. |
| 53 |
- LICENSE="${LICENSE} linux-firmware" |
| 54 |
+ LICENSE+=" linux-firmware" |
| 55 |
fi |
| 56 |
fi |
Archives