diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2013-04-18 16:51:51 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-22 14:43:42 +0100 |
| commit | c045bfe6b991006ac80f0e2d06a8917ae58d9262 (patch) | |
| tree | 4a4435b7437b3ef81da08feea9826958c8c4768d /meta | |
| parent | b9b187f8a0f513e676cd3d18f71d1055445f29fa (diff) | |
| download | openembedded-core-c045bfe6b991006ac80f0e2d06a8917ae58d9262.tar.gz openembedded-core-c045bfe6b991006ac80f0e2d06a8917ae58d9262.tar.bz2 openembedded-core-c045bfe6b991006ac80f0e2d06a8917ae58d9262.zip | |
package.bbclass: ensure license excluded files aren't packaged
An excluded package left its files behind, which meant they could end up in
another package instead, meaning we could ship GPLv3 binaries even with GPLv3
in INCOMPATIBLE_LICENSE. Skip the files belonging to the excluded packages to
prevent this from occurring.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 5524816968..1a8da40fdb 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -925,7 +925,7 @@ python populate_packages () { for pkg in packages.split(): if d.getVar('LICENSE_EXCLUSION-' + pkg, True): bb.warn("%s has an incompatible license. Excluding from packaging." % pkg) - elif pkg in package_list: + if pkg in package_list: bb.error("%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg) else: package_list.append(pkg) @@ -965,6 +965,9 @@ python populate_packages () { continue seen.append(file) + if d.getVar('LICENSE_EXCLUSION-' + pkg, True): + continue + def mkdir(src, dest, p): src = os.path.join(src, p) dest = os.path.join(dest, p) |