summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2014-08-20 16:24:21 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 23:01:57 +0100
commit65fa712ae98324bc0182bc23b3bcdb957c3a21d9 (patch)
treea811ae8bc9cc1f2318a68f32e5f394e6e92caf38 /meta
parentc448f2d0d13469aad94571e4570277ad53c88f83 (diff)
downloadpoky-65fa712ae98324bc0182bc23b3bcdb957c3a21d9.tar.gz
libc-common.bbclass: rename ALL the packages
The DEBIAN_NAMES feature renames some of the libc packages to "libc6*" names --but only some. A previous patch added the -dbg package. However, this doesn't cover other packages (such as the -doc package), and it didn't take multilibs into account. (From OE-Core rev: 64362a8f7ad7534515a9448445606581f3c572f6) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-common.bbclass19
1 files changed, 13 insertions, 6 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index daf499d3eb..bbc80167dd 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -25,12 +25,19 @@ def get_libc_fpu_setting(bb, d):
25 25
26python populate_packages_prepend () { 26python populate_packages_prepend () {
27 if d.getVar('DEBIAN_NAMES', True): 27 if d.getVar('DEBIAN_NAMES', True):
28 pkgs = d.getVar('PACKAGES', True).split()
28 bpn = d.getVar('BPN', True) 29 bpn = d.getVar('BPN', True)
29 d.setVar('PKG_'+bpn, 'libc6') 30 prefix = d.getVar('MLPREFIX', True) or ""
30 d.setVar('PKG_'+bpn+'-dev', 'libc6-dev') 31 # Set the base package...
31 d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg') 32 d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
33 libcprefix = prefix + bpn + '-'
34 for p in pkgs:
35 # And all the subpackages.
36 if p.startswith(libcprefix):
37 renamed = p.replace(bpn, 'libc6', 1)
38 d.setVar('PKG_' + p, renamed)
32 # For backward compatibility with old -dbg package 39 # For backward compatibility with old -dbg package
33 d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg') 40 d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
34 d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg') 41 d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
35 d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg') 42 d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
36} 43}