Skip to contentSkip to conversation

Multilib fix, Apr16, 2012

PATCH Applied [email protected] 2 participants 3 messages Apr 16, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Multilib fix, Apr16, 2012

From: Zhai Edwin <[email protected]>

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(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

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

From: Zhai Edwin <[email protected]>

MLPREFIX is needed in RDEPENDS for multilib build

Signed-off-by Zhai Edwin <[email protected]>
---
 meta/classes/gconf.bbclass        |    2 +-
 meta/classes/libc-package.bbclass |    2 +-
 meta/classes/useradd.bbclass      |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/gconf.bbclass +1 -1
index 095d04b..a966c26 100644
@@ -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)
 
 }
meta/classes/libc-package.bbclass +1 -1
index 7cde770..bb4ba68 100644
@@ -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 = {}
meta/classes/useradd.bbclass +2 -1
index 0bbb371..0ed91ad 100644
@@ -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
Signature · 1 line
1.7.5.4
Applied
#2 lore raw

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

Quoted 42 lines · On 04/15/2012 11:50 PM, [email protected] wrote:

From: Zhai Edwin<[email protected]>

MLPREFIX is needed in RDEPENDS for multilib build

Signed-off-by Zhai Edwin<[email protected]>
---
  meta/classes/gconf.bbclass        |    2 +-
  meta/classes/libc-package.bbclass |    2 +-
  meta/classes/useradd.bbclass      |    3 ++-
  3 files changed, 4 insertions(+), 3 deletions(-)
meta/classes/gconf.bbclass +1 -1
index 095d04b..a966c26 100644
@@ -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)
 
  }
meta/classes/libc-package.bbclass +1 -1
index 7cde770..bb4ba68 100644
@@ -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 = {}
meta/classes/useradd.bbclass +0 -0
index 0bbb371..0ed91ad 100644

meta/classes/useradd.bbclass fakeroot python populate_packages_prepend () { · line 208

Quoted 9 lines
meta/classes/useradd.bbclass +2 -1
@@ -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!