libc-common: Allow -dbg package to append, and not just set package variables

The libc-common attempts to rewrite the package information in a way similar
to debian.bbclass.  When it does this, it should be appending to the
dependency variables (RPROVIDES, RREPLACES, and RCONFLICTS), instead
of simply setting a hard coded value.  Otherwise the lib package can not
tailor the dependency variables to suite it's needs.

(From OE-Core rev: fa1c7b797593cbd5e82dc264bde2667620eb0515)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 9b91f0a..8145d64 100644 (file)
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -29,7 +29,7 @@ python populate_packages_prepend () {
                d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
                d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
                # For backward compatibility with old -dbg package
-               d.setVar('RPROVIDES_' + bpn + '-dbg', 'libc-dbg')
-               d.setVar('RCONFLICTS_' + bpn + '-dbg', 'libc-dbg')
-               d.setVar('RREPLACES_' + bpn + '-dbg', 'libc-dbg')
+               d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
+               d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
+               d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
 }