summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJian Liu <jian.liu@windriver.com>2015-10-08 14:47:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-27 07:24:27 +0000
commitd492a70c72063c0b8ee3c8ed9f1d24556c7159c9 (patch)
tree28f153785731cbaac9b05ec0126d849b63d7dfe2 /meta
parent54b7471be72ffc20d99dd48c0d8fdea5e399eecc (diff)
downloadpoky-d492a70c72063c0b8ee3c8ed9f1d24556c7159c9.tar.gz
base.bbclass: considering multilib when setting LICENSE_EXCLUSION
The PACKAGES is not mapped with MLPREFIX when setting LICENSE_EXCLUSION in base.bbclass. For example, For libgcc-dev, LICENSE_EXCLUSION-libgcc-dev=1 but for lib32-libgcc-dev, LICENSE_EXCLUSION-libgcc-dev=1 Obviously it is wrong for lib32-libgcc-dev. Add MLPREFIX before the package name during setting LICENSE_EXCLUSION (From OE-Core rev: 6597130256a1609c3e05ec5891aceaf549c37985) Signed-off-by: Jian Liu <jian.liu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d711ae477e..9bd5499a10 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -513,7 +513,8 @@ python () {
513 if unskipped_pkgs: 513 if unskipped_pkgs:
514 for pkg in skipped_pkgs: 514 for pkg in skipped_pkgs:
515 bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) 515 bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license)
516 d.setVar('LICENSE_EXCLUSION-' + pkg, 1) 516 mlprefix = d.getVar('MLPREFIX', True)
517 d.setVar('LICENSE_EXCLUSION-' + mlprefix + pkg, 1)
517 for pkg in unskipped_pkgs: 518 for pkg in unskipped_pkgs:
518 bb.debug(1, "INCLUDING the package " + pkg) 519 bb.debug(1, "INCLUDING the package " + pkg)
519 elif all_skipped or incompatible_license(d, bad_licenses): 520 elif all_skipped or incompatible_license(d, bad_licenses):