diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-08 15:41:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:12 +0100 |
commit | a6f6d4faba3d8ce02d198b0bb9f8cfb9c2963529 (patch) | |
tree | f61c9750e6179a7fe733a9d89cd89952903887a7 | |
parent | d38f055593404e6395300e37ae54ee5a4edada97 (diff) | |
download | poky-a6f6d4faba3d8ce02d198b0bb9f8cfb9c2963529.tar.gz |
package: Recommend virtual-locale-*, don't depend on it
The virtual-locale-* packages are provided by libc which may or
may not have a matching locale for any given recipes's provided locales.
Certainly, we shouldn't get a failure if the locale package isn't
available.
This patch therefore makes the dependency optional rather than
required, allowing the locale packages in question to install. This
resolves errors like:
virtual-locale-eo is needed by bash-locale-eo-4.2-r5.i586
virtual-locale-en+boldquot is needed by bash-locale-en+boldquot-4.2-r5.i586
virtual-locale-en+quot is needed by bash-locale-en+quot-4.2-r5.i586
(From OE-Core rev: 2be67f95abaa7e8655a1ca8f4ffe66b3e099a650)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 73c4358aff..03002772f6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -451,7 +451,7 @@ python package_do_split_locales() { | |||
451 | pkg = pn + '-locale-' + ln | 451 | pkg = pn + '-locale-' + ln |
452 | packages.append(pkg) | 452 | packages.append(pkg) |
453 | d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) | 453 | d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) |
454 | d.setVar('RDEPENDS_' + pkg, '%s%svirtual-locale-%s' % (pndep, mlprefix, ln)) | 454 | d.setVar('RRECOMMENDS_' + pkg, '%s%svirtual-locale-%s' % (pndep, mlprefix, ln)) |
455 | d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) | 455 | d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) |
456 | d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) | 456 | d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) |
457 | d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) | 457 | d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) |