diff options
| author | Jian Liu <jian.liu@windriver.com> | 2015-10-08 14:47:51 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-24 12:17:53 +0100 |
| commit | 6597130256a1609c3e05ec5891aceaf549c37985 (patch) | |
| tree | 4609d8b94711f44110eef6d634662f9a0e998c57 /meta/classes | |
| parent | 1003e93a1b3359a98fb631eeeda3fda184832288 (diff) | |
| download | openembedded-core-6597130256a1609c3e05ec5891aceaf549c37985.tar.gz openembedded-core-6597130256a1609c3e05ec5891aceaf549c37985.tar.bz2 openembedded-core-6597130256a1609c3e05ec5891aceaf549c37985.zip | |
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
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/base.bbclass | 3 |
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 () { if unskipped_pkgs: for pkg in skipped_pkgs: bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) - d.setVar('LICENSE_EXCLUSION-' + pkg, 1) + mlprefix = d.getVar('MLPREFIX', True) + d.setVar('LICENSE_EXCLUSION-' + mlprefix + pkg, 1) for pkg in unskipped_pkgs: bb.debug(1, "INCLUDING the package " + pkg) elif all_skipped or incompatible_license(d, bad_licenses): |