summaryrefslogtreecommitdiffstats
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:53:14 +0000
commit3754d75e49f285e530a3989888410b0877846eb6 (patch)
tree35feafe27c0cd4d5b791fcc740c69b506036b29b
parent4807e0b3aeea3445edd3c46c5da6538064c20e0e (diff)
downloadpoky-3754d75e49f285e530a3989888410b0877846eb6.tar.gz
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. (From OE-Core rev: 49c5ff7197b44c7d29d31506c2425b86bc2c1ff6) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 1796d3dc40..8cd5fecfad 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -248,9 +248,6 @@ python package_do_split_gconvs () {
248 libc_name = name 248 libc_name = name
249 d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ 249 d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
250 % (bpn, libc_name))) 250 % (bpn, libc_name)))
251 rprovides = (d.getVar('RPROVIDES_%s' % pkgname, True) or "").split()
252 rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn, libc_name)))
253 d.setVar('RPROVIDES_%s' % pkgname, " ".join(rprovides))
254 251
255 commands = {} 252 commands = {}
256 253
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index d9720e487b..b4646fac7e 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"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r18" 29PR = "r19"
30 30
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"