summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2012-03-20 17:27:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 19:17:35 +0000
commite338607f36fcad89af7d796b2e9f3a31f11e54d6 (patch)
treebcbf2dc8fb571a8aa09dc21b8dc52237fc014a8f
parentc2d96179c00e6600698d3fbc5cf5c95313ab7535 (diff)
downloadopenembedded-core-e338607f36fcad89af7d796b2e9f3a31f11e54d6.tar.gz
openembedded-core-e338607f36fcad89af7d796b2e9f3a31f11e54d6.tar.bz2
openembedded-core-e338607f36fcad89af7d796b2e9f3a31f11e54d6.zip
libc-common: Apply Debian-naming to libc debug symbols too
Ensure that the eglibc-dbg package follows Debian naming too if enabled. Retain backward compatibility with old libc-dbg naming. Signed-off-by: Mike Crowe <mac@mcrowe.com>
-rw-r--r--meta/classes/libc-common.bbclass5
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb1
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index 962f205f81..9b91f0a1a6 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -27,4 +27,9 @@ python populate_packages_prepend () {
bpn = d.getVar('BPN', True)
d.setVar('PKG_'+bpn, 'libc6')
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')
}
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e718a1f93e..a4f59b62ce 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15508"
DEPENDS += "gperf-native"
-PR = "r20"
+PR = "r21"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index b4c1ea5a99..3820f5aa09 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,6 +3,7 @@ require eglibc.inc
SRCREV = "16540"
DEPENDS += "gperf-native"
+PR = "r1"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_15"