commit: cf5243d1f881c0086cf7fb08fb7cb65f417a31a5 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 13 07:31:15 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Fri Feb 15 19:56:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5243d1
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 <AT> gentoo.org> Reviewed-by: Alice Ferrazzi <alicef <AT> gentoo.org> Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> 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 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
