[PATCH 0/1] Multilib fix, Apr16, 2012

[PATCH 0/1] Multilib fix, Apr16, 2012

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

RP,
This is multilib fix to add missing MLPREFIX. Pls. review and pull
Thanks,
Edwin

The following changes since commit 27aa5489fb40d99c58bb2a4bbf2311e2c502a091:

  distro.conf: Flipping for denzil (2012-04-04 22:48:02 -0700)

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

Zhai Edwin (1):
  Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...

 meta/classes/gconf.bbclass        |    2 +-
 meta/classes/libc-package.bbclass |    2 +-
 meta/classes/useradd.bbclass      |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

-- 
1.7.5.4

[PATCH 1/1] Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

MLPREFIX is needed in RDEPENDS for multilib build

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/classes/gconf.bbclass        |    2 +-
 meta/classes/libc-package.bbclass |    2 +-
 meta/classes/useradd.bbclass      |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 095d04b..a966c26 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -57,7 +57,7 @@ python populate_packages_append () {
 			prerm += d.getVar('gconf_prerm', True)
 			d.setVar('pkg_prerm_%s' % pkg, prerm)
 			rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
-			rdepends += " gconf"
+			rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf'
 			d.setVar("RDEPENDS_%s" % pkg, rdepends)
 
 }
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 7cde770..bb4ba68 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -257,7 +257,7 @@ python package_do_split_gconvs () {
 		else:
 			libc_name = name
 		d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-			% (bpn, libc_name)))
+			% (d.getVar('MLPREFIX') + bpn, libc_name)))
 
 	commands = {}
 
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 0bbb371..0ed91ad 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -201,7 +201,8 @@ fakeroot python populate_packages_prepend () {
 
 		# RDEPENDS setup
 		rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
-		rdepends += " base-passwd shadow"
+		rdepends += ' ' + d.getVar('MLPREFIX') + 'base-passwd'
+		rdepends += ' ' + d.getVar('MLPREFIX') + 'shadow'
 		d.setVar("RDEPENDS_%s" % pkg, rdepends)
 
 	# Add the user/group preinstall scripts and RDEPENDS requirements
-- 
1.7.5.4

Re: [PATCH 1/1] Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...

[Saul Wold]

On 04/15/2012 11:50 PM, edwin.zhai@intel.com wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> MLPREFIX is needed in RDEPENDS for multilib build
>
> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
> ---
>   meta/classes/gconf.bbclass        |    2 +-
>   meta/classes/libc-package.bbclass |    2 +-
>   meta/classes/useradd.bbclass      |    3 ++-
>   3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
> index 095d04b..a966c26 100644
> --- a/meta/classes/gconf.bbclass
> +++ b/meta/classes/gconf.bbclass
> @@ -57,7 +57,7 @@ python populate_packages_append () {
>   			prerm += d.getVar('gconf_prerm', True)
>   			d.setVar('pkg_prerm_%s' % pkg, prerm)
>   			rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
> -			rdepends += " gconf"
> +			rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf'
>   			d.setVar("RDEPENDS_%s" % pkg, rdepends)
>
>   }
> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
> index 7cde770..bb4ba68 100644
> --- a/meta/classes/libc-package.bbclass
> +++ b/meta/classes/libc-package.bbclass
> @@ -257,7 +257,7 @@ python package_do_split_gconvs () {
>   		else:
>   			libc_name = name
>   		d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
> -			% (bpn, libc_name)))
> +			% (d.getVar('MLPREFIX') + bpn, libc_name)))
>
>   	commands = {}
>
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index 0bbb371..0ed91ad 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -201,7 +201,8 @@ fakeroot python populate_packages_prepend () {
>
>   		# RDEPENDS setup
>   		rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
> -		rdepends += " base-passwd shadow"
> +		rdepends += ' ' + d.getVar('MLPREFIX') + 'base-passwd'
> +		rdepends += ' ' + d.getVar('MLPREFIX') + 'shadow'
>   		d.setVar("RDEPENDS_%s" % pkg, rdepends)
>
>   	# Add the user/group preinstall scripts and RDEPENDS requirements

Merged into OE-Core

Thanks
	Sau!