summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass18
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 5ece69e0c5..a76e6e9b36 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1041,14 +1041,11 @@ python populate_packages () {
bb.utils.mkdirhier(outdir)
os.chdir(dvar)
- # Sanity check PACKAGES for duplicates and for LICENSE_EXCLUSION
+ # Sanity check PACKAGES for duplicates
# Sanity should be moved to sanity.bbclass once we have the infrastucture
package_list = []
for pkg in packages.split():
- if d.getVar('LICENSE_EXCLUSION-' + pkg, True):
- msg = "%s has an incompatible license. Excluding from packaging." % pkg
- package_qa_handle_error("incompatible-license", msg, d)
if pkg in package_list:
msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg
package_qa_handle_error("packages-list", msg, d)
@@ -1082,9 +1079,6 @@ 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)
@@ -1125,6 +1119,16 @@ python populate_packages () {
os.umask(oldumask)
os.chdir(workdir)
+ # Handle LICENSE_EXCLUSION
+ package_list = []
+ for pkg in packages.split():
+ if d.getVar('LICENSE_EXCLUSION-' + pkg, True):
+ msg = "%s has an incompatible license. Excluding from packaging." % pkg
+ package_qa_handle_error("incompatible-license", msg, d)
+ else:
+ package_list.append(pkg)
+ d.setVar('PACKAGES', ' '.join(package_list))
+
unshipped = []
for root, dirs, files in cpath.walk(dvar):
dir = root[len(dvar):]