Fix PE handling in version strings

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3141 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 6 insertions, 4 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3d19a3a5d9..166d986862 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -115,6 +115,8 @@ PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.
 PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
 EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
+EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
+DEBPV = "${EXTENDPEVER}${PV}-${PR}"
 P = "${PN}-${PV}"
 
 # Package info.
@@ -160,14 +162,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${PN} (= ${PE}:${PV}-${PR})"
+RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
 
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
             ${libdir}/matchbox-panel/.debug"
 SECTION_${PN}-dbg = "devel"
 ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${PN} (= ${PE}:${PV}-${PR})"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
 
 FILES_${PN}-locale = "${datadir}/locale"
 
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/packages/linux-libc-headers/linux-libc-headers.inc
index b1a06152f9..42cab4c0b9 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/packages/linux-libc-headers/linux-libc-headers.inc
@@ -4,4 +4,4 @@ LICENSE = "GPL"
 
 #DEPENDS = "cross-linkage"
 RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${PV}-${PR})"
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc
index c496953286..c7188a766a 100644
--- a/meta/packages/xorg-proto/xorg-proto-common.inc
+++ b/meta/packages/xorg-proto/xorg-proto-common.inc
@@ -13,7 +13,7 @@ inherit autotools pkgconfig
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${PE}:${PV}-${PR})"
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
 
 do_stage() {
         autotools_stage_all