[oe-commits] Chris Larson : bitbake.conf: make the EXTENDPE bits slightly less disturbing

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 52ef9265223084d9d4ab38a6ff12c5be78ee380d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=52ef9265223084d9d4ab38a6ff12c5be78ee380d

Author: Chris Larson <chris_larson at mentor.com>
Date:   Wed May 19 13:27:10 2010 -0700

bitbake.conf: make the EXTENDPE bits slightly less disturbing

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 conf/bitbake.conf |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5dc6772..1980f43 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -178,8 +178,9 @@ PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'de
 PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
 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]}"
+PE ?= "0"
+EXTENDPE = "${@int('${PE}') and '${PE}_' or ''}"
+EXTENDPEVER = "${@int('${PE}') and '${PE}:' or ''}"
 EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}"
 P = "${PN}-${PV}"