From: | "Robin H. Johnson (robbat2)" <robbat2@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass |
Date: | Thu, 01 Apr 2010 21:12:23 |
Message-Id: | E1NxRga-0004DM-Aa@stork.gentoo.org |
1 | robbat2 10/04/01 21:12:20 |
2 | |
3 | Modified: kernel-2.eclass |
4 | Log: |
5 | Bug #266157: Until such time as we have full deblob support for all sources, mark that kernels contain firmware blobs that are covered under the freedist license, not GPL-2. |
6 | |
7 | Revision Changes Path |
8 | 1.225 eclass/kernel-2.eclass |
9 | |
10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.225&view=markup |
11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.225&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.224&r2=1.225 |
13 | |
14 | Index: kernel-2.eclass |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
17 | retrieving revision 1.224 |
18 | retrieving revision 1.225 |
19 | diff -p -w -b -B -u -u -r1.224 -r1.225 |
20 | --- kernel-2.eclass 13 Dec 2009 18:56:49 -0000 1.224 |
21 | +++ kernel-2.eclass 1 Apr 2010 21:12:20 -0000 1.225 |
22 | @@ -1,6 +1,6 @@ |
23 | # Copyright 1999-2009 Gentoo Foundation |
24 | # Distributed under the terms of the GNU General Public License v2 |
25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.224 2009/12/13 18:56:49 mpagano Exp $ |
26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.225 2010/04/01 21:12:20 robbat2 Exp $ |
27 | |
28 | # Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
29 | # series of kernel with back-compatibility for 2.4 |
30 | @@ -74,7 +74,9 @@ if [[ ${CTARGET} == ${CHOST} && ${CATEGO |
31 | fi |
32 | |
33 | HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}" |
34 | -LICENSE="GPL-2" |
35 | +# Reflect that kernels contain firmware blobs unless otherwise stripped |
36 | +[[ -z ${LICENSE} ]] && \ |
37 | + LICENSE="GPL-2 freedist" |
38 | |
39 | # No need to run scanelf/strip on kernel sources/headers (bug #134453). |
40 | RESTRICT="binchecks strip" |