diff options
Diffstat (limited to 'meta/classes-global/package.bbclass')
| -rw-r--r-- | meta/classes-global/package.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index e8055a9cdc..08eb56dc3d 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass | |||
| @@ -499,11 +499,9 @@ python do_package () { | |||
| 499 | # Check for conflict between renamed packages and existing ones | 499 | # Check for conflict between renamed packages and existing ones |
| 500 | # for each package in PACKAGES, check if it will be renamed to an existing one | 500 | # for each package in PACKAGES, check if it will be renamed to an existing one |
| 501 | for p in packages: | 501 | for p in packages: |
| 502 | localdata = bb.data.createCopy(d) | 502 | rename = d.getVar('PKG:%s' % p) |
| 503 | localdata.setVar('OVERRIDES', p) | 503 | if rename and rename in packages: |
| 504 | rename = localdata.getVar('PKG') | 504 | bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists' % (p, rename, p)) |
| 505 | if (rename != None) and rename in packages: | ||
| 506 | bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) | ||
| 507 | 505 | ||
| 508 | ########################################################################### | 506 | ########################################################################### |
| 509 | # Optimisations | 507 | # Optimisations |