[PATCH 0/1][1.2.1][PULL] Multilib bug fix

[PATCH 0/1][1.2.1][PULL] Multilib bug fix

[Dongxiao Xu]

Hi Richard and Scott,

This pull request is to fix some multilib issues in libc-package.bbclass. Please help to review and pull.

This is both for upstream and 1.2.1 branch.

Thanks,
Dongxiao

The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:

  kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/multilib
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/multilib

Dongxiao Xu (1):
  libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDS

 meta/classes/libc-package.bbclass          |   12 +++++++-----
 meta/recipes-core/eglibc/eglibc-locale.inc |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDS

[Dongxiao Xu]

We need to add MLPREFIX when set RDEPENDS by setVar() function.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/libc-package.bbclass          |   12 +++++++-----
 meta/recipes-core/eglibc/eglibc-locale.inc |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 51edba2..57b6fd9 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -126,6 +126,8 @@ python package_do_split_gconvs () {
 	if not d.getVar('PACKAGES', True):
 		return
 
+	mlprefix = d.getVar("MLPREFIX", True) or ""
+
 	bpn = d.getVar('BPN', True)
 	libdir = d.getVar('libdir', True)
 	if not libdir:
@@ -149,7 +151,7 @@ python package_do_split_gconvs () {
 		for l in f.readlines():
 			m = c_re.match(l) or i_re.match(l)
 			if m:
-				dp = legitimize_package_name('%s-gconv-%s' % (bpn, m.group(1)))
+				dp = legitimize_package_name('%s%s-gconv-%s' % (mlprefix, bpn, m.group(1)))
 				if not dp in deps:
 					deps.append(dp)
 		f.close()
@@ -170,7 +172,7 @@ python package_do_split_gconvs () {
 		for l in f.readlines():
 			m = c_re.match(l) or i_re.match(l)
 			if m:
-				dp = legitimize_package_name('%s-charmap-%s' % (bpn, m.group(1)))
+				dp = legitimize_package_name('%s%s-charmap-%s' % (mlprefix, bpn, m.group(1)))
 				if not dp in deps:
 					deps.append(dp)
 		f.close()
@@ -190,7 +192,7 @@ python package_do_split_gconvs () {
 		for l in f.readlines():
 			m = c_re.match(l) or i_re.match(l)
 			if m:
-				dp = legitimize_package_name(bpn+'-localedata-%s' % m.group(1))
+				dp = legitimize_package_name(mlprefix+bpn+'-localedata-%s' % m.group(1))
 				if not dp in deps:
 					deps.append(dp)
 		f.close()
@@ -234,7 +236,7 @@ python package_do_split_gconvs () {
 
 	def output_locale_source(name, pkgname, locale, encoding):
 		d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \
-		(bpn, legitimize_package_name(locale), bpn, legitimize_package_name(encoding)))
+		(mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding)))
 		d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \
 		% (locale, encoding, locale))
 		d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \
@@ -247,7 +249,7 @@ python package_do_split_gconvs () {
 		else:
 			libc_name = name
 		d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-			% (d.getVar('MLPREFIX') + bpn, libc_name)))
+			% (mlprefix+bpn, libc_name)))
 
 	commands = {}
 
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 9d5434f..70c5cd1 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 = "r20"
+PR = "r21"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-- 
1.7.4.1

Re: [PATCH 0/1][1.2.1][PULL] Multilib bug fix

[Saul Wold]

On 05/08/2012 10:28 PM, Dongxiao Xu wrote:
> Hi Richard and Scott,
>
> This pull request is to fix some multilib issues in libc-package.bbclass. Please help to review and pull.
>
> This is both for upstream and 1.2.1 branch.
>
> Thanks,
> Dongxiao
>
> The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:
>
>    kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib dxu4/multilib
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/multilib
>
> Dongxiao Xu (1):
>    libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDS
>
>   meta/classes/libc-package.bbclass          |   12 +++++++-----
>   meta/recipes-core/eglibc/eglibc-locale.inc |    2 +-
>   2 files changed, 8 insertions(+), 6 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!