diff options
author | Richard Purdie <richard@openedhand.com> | 2007-05-31 22:51:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-05-31 22:51:19 +0000 |
commit | c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f (patch) | |
tree | 1962c4a32b81b6540ea00671c4ea61975a705f88 /meta/conf | |
parent | 8a5b785a6de3cab51c553edbdddf2c6cf690d1e1 (diff) | |
download | openembedded-core-c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f.tar.gz openembedded-core-c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f.tar.bz2 openembedded-core-c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f.zip |
classes/conf: Merge missing package epoch (PE) support (from OE), also make OE package field sane
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1839 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index cb5069ab67..296f2c9abd 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" 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}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. |