Patchwork [CONSOLIDATED,PULL,09/62] locale: fix package's "provides" tag

login
register
mail settings
Submitter Saul Wold
Date Jan. 17, 2012, 8:31 a.m.
Message ID <365d1d6fdd94af0bb73b349e7e445b9c8ec91b2f.1326786989.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19465/
State New
Headers show

Comments

Saul Wold - Jan. 17, 2012, 8:31 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

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>
---
 meta/classes/libc-package.bbclass          |    3 ---
 meta/recipes-core/eglibc/eglibc-locale.inc |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 1796d3d..8cd5fec 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 d9720e4..b4646fa 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"