summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-31 12:33:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 15:35:35 +0100
commitd36c3235b3022c07f064929f55114f808a7634f6 (patch)
treeaf39af46322ccf7993278c9c87f64364c5b549e4
parent45f38d167b523d769c072474b36b3d9b31b4e9d9 (diff)
downloadopenembedded-core-d36c3235b3022c07f064929f55114f808a7634f6.tar.gz
openembedded-core-d36c3235b3022c07f064929f55114f808a7634f6.tar.bz2
openembedded-core-d36c3235b3022c07f064929f55114f808a7634f6.zip
classes/package: don't make locale pkgs depend on PN pkg if not in PACKAGES
If ${PN} is not in PACKAGES then don't add it as an RDEPENDS for each locale package. This fixes the installation of gcc-runtime locale packages, for example. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 4be2fc2dc5..d122cd9f8f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -408,12 +408,13 @@ python package_do_split_locales() {
description = d.getVar('DESCRIPTION', True) or ""
locale_section = d.getVar('LOCALE_SECTION', True)
mlprefix = d.getVar('MLPREFIX', True) or ""
+ pndep = base_contains('PACKAGES', pn, '%s ' % pn, '', d)
for l in sorted(locales):
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln
packages.append(pkg)
d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
- d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln))
+ d.setVar('RDEPENDS_' + pkg, '%s%svirtual-locale-%s' % (pndep, mlprefix, ln))
d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))