Patchwork classes/package: don't make locale pkgs depend on PN pkg if not in PACKAGES

login
register
mail settings
Submitter Paul Eggleton
Date July 31, 2012, 11:33 a.m.
Message ID <1343734381-11130-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/33421/
State Accepted
Commit d36c3235b3022c07f064929f55114f808a7634f6
Headers show

Comments

Paul Eggleton - July 31, 2012, 11:33 a.m.
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>
---
 meta/classes/package.bbclass |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Andreas Müller - July 31, 2012, 1:12 p.m.
On Tue, Jul 31, 2012 at 1:33 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> 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>
> ---
>  meta/classes/package.bbclass |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 3aaf999..9c4e643 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -407,12 +407,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))
> --
> 1.7.9.5
Thanks for unbreaking do_rootfs part II

Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3aaf999..9c4e643 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -407,12 +407,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))