summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-31 11:33:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:35:45 (GMT)
commit06ad59cca92f58d4eefa42b532a778f3b83c66a1 (patch)
tree42371eda84fc2da873106433258975fb44fbb267
parentb9fa9d713ba4fbf1c8a71c05f9b3e863e82dea9e (diff)
downloadpoky-06ad59cca92f58d4eefa42b532a778f3b83c66a1.tar.gz
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. (From OE-Core rev: d36c3235b3022c07f064929f55114f808a7634f6) 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 4be2fc2..d122cd9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -408,12 +408,13 @@ python package_do_split_locales() {
408 description = d.getVar('DESCRIPTION', True) or "" 408 description = d.getVar('DESCRIPTION', True) or ""
409 locale_section = d.getVar('LOCALE_SECTION', True) 409 locale_section = d.getVar('LOCALE_SECTION', True)
410 mlprefix = d.getVar('MLPREFIX', True) or "" 410 mlprefix = d.getVar('MLPREFIX', True) or ""
411 pndep = base_contains('PACKAGES', pn, '%s ' % pn, '', d)
411 for l in sorted(locales): 412 for l in sorted(locales):
412 ln = legitimize_package_name(l) 413 ln = legitimize_package_name(l)
413 pkg = pn + '-locale-' + ln 414 pkg = pn + '-locale-' + ln
414 packages.append(pkg) 415 packages.append(pkg)
415 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) 416 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
416 d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln)) 417 d.setVar('RDEPENDS_' + pkg, '%s%svirtual-locale-%s' % (pndep, mlprefix, ln))
417 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) 418 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
418 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) 419 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
419 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) 420 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))