From 79599515788b85b18aa655e7b7f8cc05c1bbddd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Feb 2019 12:59:29 +0000 Subject: gentoo resync : 16.02.1018 --- eclass/kernel-2.eclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'eclass/kernel-2.eclass') diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 48146b7284b9..edbb4a8584d4 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 -- cgit v1.2.3