From 02b61bf09dbbeb1a5f213dcad0c8c69660f372f5 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Thu, 18 Apr 2013 16:51:51 -0700 Subject: 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) (From OE-Core rev: f6bd8fcf07ddcac43e74bdcd1dfacd45b12a7df3) Signed-off-by: Christopher Larson Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/package.bbclass') 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) -- cgit v1.2.3-54-g00ecf