From: Jian Liu Date: Thu, 8 Oct 2015 06:47:51 +0000 (+0800) Subject: base.bbclass: considering multilib when setting LICENSE_EXCLUSION X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28553 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6597130256a1609c3e05ec5891aceaf549c37985;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d711ae477e0..9bd5499a107 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):