diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 12:03:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:20 +0000 |
| commit | 3e3cb6207b07b4e9f15c621e2851c8950b724215 (patch) | |
| tree | c52c6e3e74d560230707f5ddeab3c15aa6525e76 /meta/conf/bitbake.conf | |
| parent | b963efbc9c4852328975046caa76cf941518f168 (diff) | |
| download | openembedded-core-contrib-3e3cb6207b07b4e9f15c621e2851c8950b724215.tar.gz | |
bitbake.conf: Remove horrible variable expansion hacks
We used to need these hacks to make things work. Rework the variables to
remove the horrible hacks and make things slightly less ugly. This does
mean PE and PRAUTO are given default empty values but this is preferred
to the other ugliness.
(From OE-Core rev: f37af830448794d3941aca9ab4b2bfa9d8358694)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index fc57a58366..3a1953785e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -189,17 +189,19 @@ ASSUME_PROVIDED = "\ PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}" +PE = "" PF = "${PN}-${EXTENDPE}${PV}-${PR}" -EXTENDPE = "${@['','${PE\x7d_'][int(d.getVar('PE', True) or 0) > 0]}" +EXTENDPE = "${@['','${PE}_'][int(d.getVar('PE', True) or 0) > 0]}" P = "${PN}-${PV}" -EXTENDPRAUTO = "${@['.${PRAUTO\x7d',''][d.getVar('PRAUTO', True) is None]}" +PRAUTO = "" +EXTENDPRAUTO = "${@['.${PRAUTO}', ''][not d.getVar('PRAUTO', True)]}" PRAUTOINX = "${PF}" PKGV ?= "${PV}" PKGR ?= "${PR}${EXTENDPRAUTO}" -PKGE ?= "${@['','${PE\x7d'][int(d.getVar('PE', True) or 0) > 0]}" -EXTENDPKGEVER = "${@['','${PKGE\x7d:'][d.getVar('PKGE', True).strip() != '']}" +PKGE ?= "${@['','${PE}'][int(d.getVar('PE', True) or 0) > 0]}" +EXTENDPKGEVER = "${@['','${PKGE}:'][d.getVar('PKGE', True).strip() != '']}" EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" # Base package name |