From 52ef9265223084d9d4ab38a6ff12c5be78ee380d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 19 May 2010 13:27:10 -0700 Subject: bitbake.conf: make the EXTENDPE bits slightly less disturbing Signed-off-by: Chris Larson --- conf/bitbake.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') 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}" -- cgit v1.2.3