libc-common.bbclass: DEBIAN_NAMES expansion
cover libc-common.bbclass: DEBIAN_NAMES expansion
DEBIAN_NAMES ought to work for multilibs, and it ought to handle all the libc packages, not just the base, -dev, and -dbg packages.
I do have one concern about this: The last three lines of the function, setting up PROVIDE for libc-dbg... I do not know whether we still need or want those. The comment about compatibility with "old" libc makes me think this may be obsolete.
Testing: Built for multilibs, confirmed that various things seem to work. The specific motivation was that the -doc packages weren't getting installed by the doc-pkgs feature.
The following changes since commit c58e6cf352774e147038e6543ac95ab0060f2327:
Anders Roxell (1):
distro_check: Remove creation of empty Meego filelist.
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib seebs/debiannames
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/debiannames
Peter Seebach (1):
libc-common.bbclass: rename ALL the packages
meta/classes/libc-common.bbclass | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
PATCH 1/1 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.
--- meta/classes/libc-common.bbclass | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
meta/classes/libc-common.bbclass +13 -6
@@ -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') + initial = prefix + bpn + '-' + for p in pkgs: + # And all the subpackages. + if p.startswith(initial): + 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_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') }
Signature · 1 line
1.7.0.4