diff options
| author | Phil Blundell <philb@gnu.org> | 2004-08-21 17:20:36 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-08-21 17:20:36 +0000 |
| commit | 8f0e92c15a77e3d398467ec3c8923590f7728827 (patch) | |
| tree | 2ccb3ba41a610e17566c7cf22f854792b31bbce0 /classes | |
| parent | 12454191edf9fe75a300eca5491cf615179ebbbf (diff) | |
set RDEPENDS on locale packages symbolically, since PKG_%s doesn't exist prior to populate_packages.
provide default definition of PKG_pkg for all packages that don't have one after package_name_hook runs.
BKrev: 41278464RB1RG5_-kacBwKgs1tuYuQ
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package.oeclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/classes/package.oeclass b/classes/package.oeclass index f0d5f5a832..83257a57fc 100644 --- a/classes/package.oeclass +++ b/classes/package.oeclass @@ -199,6 +199,10 @@ python populate_packages () { oe.build.exec_func("package_name_hook", d) + for pkg in packages.split(): + if oe.data.getVar('PKG_%s' % pkg, d, 1) is None: + oe.data.setVar('PKG_%s' % pkg, pkg, d) + dangling_links = {} pkg_files = {} for pkg in packages.split(): @@ -546,14 +550,13 @@ python package_do_split_locales() { locales = os.listdir(localedir) mainpkg = packages[0] - mainpkg_n = oe.data.getVar('PKG_%s' % mainpkg, d, 1) or mainpkg for l in locales: ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln packages.append(pkg) oe.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d) - oe.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg_n, ln), d) + oe.data.setVar('RDEPENDS_' + pkg, '${PKG_%s} virtual-locale-%s' % (mainpkg, ln), d) oe.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d) oe.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d) |