[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     38bce48ced4a3541ca86151ec83c1d286471907b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 17:08:23 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 17:14:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bce48c

kernel-2.eclass: Specify LICENSE for firmware more precisely.

Acked-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 eclass/kernel-2.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 84909f30ca3..6d75c7fa65b 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kernel-2.eclass
@@ -146,7 +146,7 @@
 # @DESCRIPTION:
 # This kernel was already deblobbed elsewhere.
 # If false, either optional deblobbing will be available
-# or the license will note the inclusion of freedist code.
+# or the license will note the inclusion of linux-firmware code.
 
 # @ECLASS-VARIABLE:  K_LONGTERM
 # @DEFAULT_UNSET
@@ -624,7 +624,7 @@ if [[ ${ETYPE} == sources ]]; then
 
 			# Reflect that kernels contain firmware blobs unless otherwise
 			# stripped
-			LICENSE="${LICENSE} !deblob? ( freedist )"
+			LICENSE="${LICENSE} !deblob? ( linux-firmware )"
 
 			DEPEND+=" deblob? ( ${PYTHON_DEPS} )"
 
@@ -661,7 +661,7 @@ if [[ ${ETYPE} == sources ]]; then
 		else
 			# We have no way to deblob older kernels, so just mark them as
 			# tainted with non-libre materials.
-			LICENSE="${LICENSE} freedist"
+			LICENSE="${LICENSE} linux-firmware"
 		fi
 	fi