aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2018-04-04 17:01:41 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-04-04 22:59:28 +1200
commit2a8dd808adeef0efed679f04f2310cb9bf36827e (patch)
treedf952fbd7424bf700f8b6953d2e06dc6fcdd04cc
parentc168f6fe35ada66f7d6d6b5151fa248230c38676 (diff)
downloadopenembedded-core-contrib-2a8dd808adeef0efed679f04f2310cb9bf36827e.tar.gz
openembedded-core-contrib-2a8dd808adeef0efed679f04f2310cb9bf36827e.tar.bz2
openembedded-core-contrib-2a8dd808adeef0efed679f04f2310cb9bf36827e.zip
classes/externalsrc: handle if cleandirs contains python expressions
Use the existing oe.recipeutils.split_var_value() function to split the unexpanded value of the cleandirs varflag, in case it contains python expressions - we don't want to split the expression itself as the chunks will not expand properly individually and we can miss something that expands to the source tree (and thus it can get deleted, the avoidance of which is the whole point of this code). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/classes/externalsrc.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 3f1d39689b8..ce8517c58b7 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -53,6 +53,8 @@ python () {
d.setVar('BB_DONT_CACHE', '1')
if externalsrc:
+ import oe.recipeutils
+
d.setVar('S', externalsrc)
if externalsrcbuild:
d.setVar('B', externalsrcbuild)
@@ -85,7 +87,7 @@ python () {
d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock")
# We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean)
- cleandirs = (d.getVarFlag(task, 'cleandirs', False) or '').split()
+ cleandirs = oe.recipeutils.split_var_value(d.getVarFlag(task, 'cleandirs', False) or '')
setvalue = False
for cleandir in cleandirs[:]:
if d.expand(cleandir) == externalsrc: