mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-24 22:36:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

base.bbclass/poky.conf: Fix INCOMPATIBLE_LICENSE Whitelist checking

Browse Source 
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
This commit is contained in:
Saul Wold
2010-10-07 14:39:05 -07:00
committed by Saul Wold
parent ddbf5e9c48
commit 50911329d4
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/base.bbclass
View File

@@ -494,10 +494,11 @@ python () {
dont_want_license = bb.data.getVar('INCOMPATIBLE_LICENSE', d, 1) dont_want_license = bb.data.getVar('INCOMPATIBLE_LICENSE', d, 1)
if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate"): if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate"):
gplv3_hosttools_whitelist = (bb.data.getVar("GPLv3_HOSTTOOLS_WHITELIST", d, 1) or "").split() hosttools_whitelist = (bb.data.getVar('HOSTTOOLS_WHITELIST_%s' % dont_want_license, d, 1) or "").split()
gplv3_lgplv2_whitelist = (bb.data.getVar("GPLv3_LGPLv2_WHITELIST", d, 1) or "").split() lgplv2_whitelist = (bb.data.getVar('LGPLv2_WHITELIST_%s' % dont_want_license, d, 1) or "").split()
gplv3_whitelist = (bb.data.getVar("GPLv3_WHITELIST", d, 1) or "").split() dont_want_whitelist = (bb.data.getVar('WHITELIST_%s' % dont_want_license, d, 1) or "").split()
if pn not in gplv3_hosttools_whitelist and pn not in gplv3_lgplv2_whitelist and pn not in gplv3_whitelist: if pn not in hosttools_whitelist and pn not in lgplv2_whitelist and pn not in dont_want_whitelist:
import re import re
this_license = bb.data.getVar('LICENSE', d, 1) this_license = bb.data.getVar('LICENSE', d, 1)
if this_license and re.search(dont_want_license, this_license): if this_license and re.search(dont_want_license, this_license):

6
meta/conf/distro/poky.conf
View File

@@ -122,9 +122,9 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
# This is a list of packages that are used by poky to build the distribution, they are not # This is a list of packages that are used by poky to build the distribution, they are not
# directly part of the distribution. # directly part of the distribution.
GPLv3_HOSTTOOLS_WHITELIST = "" HOSTTOOLS_WHITELIST_GPLv3 = ""
GPLv3_WHITELIST = "less gnome-common" WHITELIST_GPLv3 = "less gnome-common"
GPLv3_LGPLv2_WHITELIST = "libassuan gnutls libtasn1 libidn" LGPLv2_WHITELIST_GPLv3 = "libassuan gnutls libtasn1 libidn"
# This is a list of packages that require a commercial license to ship # This is a list of packages that require a commercial license to ship
# product. If shipped as part of an image these packages may have # product. If shipped as part of an image these packages may have