[PATCH] bitbake.conf: Remove horrible variable expansion hacks
DORMANTno replies
From: Richard Purdie <hidden>
Date: 2016-01-22 12:03:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. Signed-off-by: Richard Purdie <redacted>
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index fba4d17..7451eb8 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