diff options
| author | Peter Seebach <peter.seebach@windriver.com> | 2014-08-20 16:24:21 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 23:01:33 +0100 |
| commit | 64362a8f7ad7534515a9448445606581f3c572f6 (patch) | |
| tree | 5bce715b51639e6acdd799203ba65a8d6a4a6a13 /meta/classes/libc-common.bbclass | |
| parent | 43813ddfa8cade9ea1c5de24dcd4e275b1486cff (diff) | |
| download | openembedded-core-64362a8f7ad7534515a9448445606581f3c572f6.tar.gz openembedded-core-64362a8f7ad7534515a9448445606581f3c572f6.tar.bz2 openembedded-core-64362a8f7ad7534515a9448445606581f3c572f6.zip | |
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.
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/classes/libc-common.bbclass')
| -rw-r--r-- | meta/classes/libc-common.bbclass | 19 |
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): python populate_packages_prepend () { if d.getVar('DEBIAN_NAMES', True): + pkgs = d.getVar('PACKAGES', True).split() bpn = d.getVar('BPN', True) - d.setVar('PKG_'+bpn, 'libc6') - d.setVar('PKG_'+bpn+'-dev', 'libc6-dev') - d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg') + prefix = d.getVar('MLPREFIX', True) or "" + # Set the base package... + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + libcprefix = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(libcprefix): + renamed = p.replace(bpn, 'libc6', 1) + d.setVar('PKG_' + p, renamed) # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg') - d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg') - d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg') + d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') } |