From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NxRgd-0001fg-0z for garchives@archives.gentoo.org; Thu, 01 Apr 2010 21:12:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AB13E0A8D; Thu, 1 Apr 2010 21:12:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 521D3E0A8D for ; Thu, 1 Apr 2010 21:12:21 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id E69451B4067 for ; Thu, 1 Apr 2010 21:12:20 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NxRga-0004DM-Aa for gentoo-commits@lists.gentoo.org; Thu, 01 Apr 2010 21:12:20 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kernel-2.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Thu, 01 Apr 2010 21:12:20 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 25e3c91e-efb1-4302-989c-e212dfd9cfa6 X-Archives-Hash: 3ebfe3a5c2df4e6f537ad2c42739cf5a robbat2 10/04/01 21:12:20 Modified: kernel-2.eclass Log: Bug #266157: Until such time as we have full deblob support for all sou= rces, mark that kernels contain firmware blobs that are covered under the= freedist license, not GPL-2. Revision Changes Path 1.225 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.225&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.ec= lass?rev=3D1.225&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.ec= lass?r1=3D1.224&r2=3D1.225 Index: kernel-2.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.224 retrieving revision 1.225 diff -p -w -b -B -u -u -r1.224 -r1.225 --- kernel-2.eclass 13 Dec 2009 18:56:49 -0000 1.224 +++ kernel-2.eclass 1 Apr 2010 21:12:20 -0000 1.225 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.224 2009/1= 2/13 18:56:49 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.225 2010/0= 4/01 21:12:20 robbat2 Exp $ =20 # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -74,7 +74,9 @@ if [[ ${CTARGET} =3D=3D ${CHOST} && ${CATEGO fi =20 HOMEPAGE=3D"http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}" -LICENSE=3D"GPL-2" +# Reflect that kernels contain firmware blobs unless otherwise stripped +[[ -z ${LICENSE} ]] && \ + LICENSE=3D"GPL-2 freedist" =20 # No need to run scanelf/strip on kernel sources/headers (bug #134453). RESTRICT=3D"binchecks strip"