Patchwork package: Recommend virtual-locale-*, don't depend on it

login
register
mail settings
Submitter Richard Purdie
Date Oct. 8, 2012, 3:49 p.m.
Message ID <1349711362.15658.120.camel@ted>
Download mbox | patch
Permalink /patch/37927/
State Accepted
Commit a6f6d4faba3d8ce02d198b0bb9f8cfb9c2963529
Headers show

Comments

Richard Purdie - Oct. 8, 2012, 3:49 p.m.
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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Chris Larson - Oct. 10, 2012, 2:45 p.m.
On Mon, Oct 8, 2012 at 8:49 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> 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
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

This looks helpful -- I know of at least one person internal at Mentor
being bit by this.

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 73c4358..0300277 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -451,7 +451,7 @@  python package_do_split_locales() {
         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' % (pndep, mlprefix, ln))
+        d.setVar('RRECOMMENDS_' + 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))