summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-28 16:08:51 -0500
committerSaul Wold <sgw@linux.intel.com>2012-07-03 00:05:40 -0700
commitfa1c7b797593cbd5e82dc264bde2667620eb0515 (patch)
treea2e2a52c66ab0fa1c66a045e85b98ab773f04987
parent7ad08f5b73aa949a877adc5641b4bb1d007de750 (diff)
downloadopenembedded-core-fa1c7b797593cbd5e82dc264bde2667620eb0515.tar.gz
openembedded-core-fa1c7b797593cbd5e82dc264bde2667620eb0515.tar.bz2
openembedded-core-fa1c7b797593cbd5e82dc264bde2667620eb0515.zip
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. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta/classes/libc-common.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 9b91f0a1a6..8145d64e29 100644
--- 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')
}