Gentoo Archives: gentoo-dev

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

Attachments

File name MIME type
signature.asc application/pgp-signature