diff options
| -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 0338a5c690..7787042e21 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass | |||
| @@ -508,11 +508,9 @@ python do_package () { | |||
| 508 | # Check for conflict between renamed packages and existing ones | 508 | # Check for conflict between renamed packages and existing ones |
| 509 | # for each package in PACKAGES, check if it will be renamed to an existing one | 509 | # for each package in PACKAGES, check if it will be renamed to an existing one |
| 510 | for p in packages: | 510 | for p in packages: |
| 511 | localdata = bb.data.createCopy(d) | 511 | rename = d.getVar('PKG:%s' % p) |
| 512 | localdata.setVar('OVERRIDES', p) | 512 | if rename and rename in packages: |
| 513 | rename = localdata.getVar('PKG') | 513 | bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists' % (p, rename, p)) |
| 514 | if (rename != None) and rename in packages: | ||
| 515 | bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) | ||
| 516 | 514 | ||
| 517 | ########################################################################### | 515 | ########################################################################### |
| 518 | # Optimisations | 516 | # Optimisations |