summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-19 13:27:10 -0700
committerChris Larson <chris_larson@mentor.com>2010-06-10 11:35:01 -0700
commit52ef9265223084d9d4ab38a6ff12c5be78ee380d (patch)
treececc711f8d8050f4feb30dfe978f4f1fa95f5ec9 /conf
parent29e61b1d387b8e7b5bba8cbcbb9cfb2e2954ab68 (diff)
bitbake.conf: make the EXTENDPE bits slightly less disturbing
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5dc6772c00..1980f43416 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}"