diff options
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 () { | |||
| 925 | for pkg in packages.split(): | 925 | for pkg in packages.split(): |
| 926 | if d.getVar('LICENSE_EXCLUSION-' + pkg, True): | 926 | if d.getVar('LICENSE_EXCLUSION-' + pkg, True): |
| 927 | bb.warn("%s has an incompatible license. Excluding from packaging." % pkg) | 927 | bb.warn("%s has an incompatible license. Excluding from packaging." % pkg) |
| 928 | elif pkg in package_list: | 928 | if pkg in package_list: |
| 929 | bb.error("%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg) | 929 | bb.error("%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg) |
| 930 | else: | 930 | else: |
| 931 | package_list.append(pkg) | 931 | package_list.append(pkg) |
| @@ -965,6 +965,9 @@ python populate_packages () { | |||
| 965 | continue | 965 | continue |
| 966 | seen.append(file) | 966 | seen.append(file) |
| 967 | 967 | ||
| 968 | if d.getVar('LICENSE_EXCLUSION-' + pkg, True): | ||
| 969 | continue | ||
| 970 | |||
| 968 | def mkdir(src, dest, p): | 971 | def mkdir(src, dest, p): |
| 969 | src = os.path.join(src, p) | 972 | src = os.path.join(src, p) |
| 970 | dest = os.path.join(dest, p) | 973 | dest = os.path.join(dest, p) |
