summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-01-09 11:33:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:52:57 +0000
commit49c5ff7197b44c7d29d31506c2425b86bc2c1ff6 (patch)
tree15c67432d2ac7343944373a8763c0b14b22fd40a
parentdd05e06b89906002f68d616a6326c962e725bc54 (diff)
downloadopenembedded-core-49c5ff7197b44c7d29d31506c2425b86bc2c1ff6.tar.gz
openembedded-core-49c5ff7197b44c7d29d31506c2425b86bc2c1ff6.tar.bz2
openembedded-core-49c5ff7197b44c7d29d31506c2425b86bc2c1ff6.tar.xz
openembedded-core-49c5ff7197b44c7d29d31506c2425b86bc2c1ff6.zip
locale: fix package's "provides" tag
Fixes this bug: [YOCTO #1874] Fixes an issue where a locale package depends on one package while it also provides the same, as seen bellow. Package: locale-base-de-de Version: 2.12-r19 Depends: eglibc-binary-localedata-de-de Provides: virtual-locale-de-de, virtual-locale-de, eglibc-binary-localedata-de-de Actually the eglibc-binary-localedata-de-de is ia separate package, and it should not be part of provides of the locale-base-de-de. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/classes/libc-package.bbclass3
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc2
2 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 1796d3dc4..8cd5fecfa 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -248,9 +248,6 @@ python package_do_split_gconvs () {
libc_name = name
d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
% (bpn, libc_name)))
- rprovides = (d.getVar('RPROVIDES_%s' % pkgname, True) or "").split()
- rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn, libc_name)))
- d.setVar('RPROVIDES_%s' % pkgname, " ".join(rprovides))
commands = {}
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index d9720e487..b4646fac7 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
# set "0" for qemu emulation of native localedef for locale generation
LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
-PR = "r18"
+PR = "r19"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"