diff options
| author |   Christopher Larson <chris_larson@mentor.com> | 2013-04-18 16:51:51 -0700 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-11 19:02:38 +0000 |
| commit | f6bd8fcf07ddcac43e74bdcd1dfacd45b12a7df3 (patch) | |
| tree | b2b0b7f73b3586df0f194cf8ba54a9ca603cea24 | |
| parent | 32c064e567aaba18dfb07b171dde9cc43d0e6de8 (diff) | |
| download | openembedded-core-f6bd8fcf07ddcac43e74bdcd1dfacd45b12a7df3.tar.gz | |
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.
(From OE-Core master rev: c045bfe6b991006ac80f0e2d06a8917ae58d9262)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 202b4ed1c9..80aaec21cb 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) |