diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-29 13:53:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-01 15:51:29 +0000 |
| commit | df38695f0fbea10289e85fdcb7c2bdf566990577 (patch) | |
| tree | d151a2d05b4df8d04e37bca99315a03908afb604 | |
| parent | b5d65f5d5e5b26d3a2c673e899114c90bcaf6bc8 (diff) | |
| download | openembedded-core-df38695f0fbea10289e85fdcb7c2bdf566990577.tar.gz openembedded-core-df38695f0fbea10289e85fdcb7c2bdf566990577.tar.bz2 openembedded-core-df38695f0fbea10289e85fdcb7c2bdf566990577.zip | |
package.bbclass: Move PKG handling code to emit_pkgdata
We only use the PKG variable in emit_pkgdata so we might as well move the
fallback code there, allowing restructuring of other parts of the metadata.
(From OE-Core rev: 0136ae9a5f719f0e7ba6e00bfd366c0e61b3b3f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 4e7db9af25..858afbd07c 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1038,11 +1038,6 @@ python populate_packages () { bb.build.exec_func("package_name_hook", d) - for pkg in package_list: - pkgname = d.getVar('PKG_%s' % pkg, True) - if pkgname is None: - d.setVar('PKG_%s' % pkg, pkg) - dangling_links = {} pkg_files = {} for pkg in package_list: @@ -1154,6 +1149,11 @@ python emit_pkgdata() { for pkg in packages.split(): subdata_file = pkgdatadir + "/runtime/%s" % pkg + pkgval = d.getVar('PKG_%s' % pkg, True) + if pkgval is None: + pkgval = pkg + d.setVar('PKG_%s' % pkg, pkg) + sf = open(subdata_file, 'w') write_if_exists(sf, pkg, 'PN') write_if_exists(sf, pkg, 'PV') @@ -1189,7 +1189,6 @@ python emit_pkgdata() { sf.close() # Symlinks needed for reverse lookups (from the final package name) - pkgval = d.getVar('PKG_%s' % (pkg), True) subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval oe.path.symlink("../runtime/%s" % pkg, subdata_sym, True) |