From patchwork Wed Jan 30 14:01:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [10/17] package.bbclass: Move PKG handling code to emit_pkgdata Date: Wed, 30 Jan 2013 14:01:03 -0000 From: Richard Purdie X-Patchwork-Id: 43709 Message-Id: To: openembedded-core@lists.openembedded.org 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. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 4e7db9a..858afbd 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)