externalsrc.bbclass: better filtering of cleandirs
PATCH 1/1 externalsrc.bbclass: better filtering of cleandirs
We really do not want our (external) source tree to be removed. There might be multiple values in the 'cleandirs' varflag pointing to our source tree - causing it to be wiped out. This patch improves the filtering of 'cleandirs' by examining the expanded values inside it. Any (expanded) values pointing to our source tree get removed.
--- meta/classes/externalsrc.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
meta/classes/externalsrc.bbclass +7 -11
@@ -58,18 +58,14 @@ 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) - if cleandirs: - cleandirs = cleandirs.split() - setvalue = False - if '${S}' in cleandirs: - cleandirs.remove('${S}') + cleandirs = (d.getVarFlag(task, 'cleandirs', False) or '').split() + setvalue = False + for cleandir in cleandirs[:]: + if d.expand(cleandir) == externalsrc: + cleandirs.remove(cleandir) setvalue = True - if externalsrcbuild == externalsrc and '${B}' in cleandirs: - cleandirs.remove('${B}') - setvalue = True - if setvalue: - d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) + if setvalue: + d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) fetch_tasks = ['do_fetch', 'do_unpack'] # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one
Signature · 1 line
2.1.4
Quoted 42 lines · On Tuesday 08 September 2015 13:36:40 Markus Lehtonen wrote:
We really do not want our (external) source tree to be removed. There might be multiple values in the 'cleandirs' varflag pointing to our source tree - causing it to be wiped out. This patch improves the filtering of 'cleandirs' by examining the expanded values inside it. Any (expanded) values pointing to our source tree get removed.
Signed-off-by Markus Lehtonen <[email protected]>--- meta/classes/externalsrc.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)(quoted diff) +0
-0b/meta/classes/externalsrc.bbclass index 8f7f479..499688b 100644
meta/classes/externalsrc.bbclass +0
-0@@ -58,18 +58,14 @@ 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)meta/classes/externalsrc.bbclass +1
-5- if cleandirs: - cleandirs = cleandirs.split() - setvalue = False - if '${S}' in cleandirs: - cleandirs.remove('${S}') + cleandirs = (d.getVarFlag(task, 'cleandirs', False) or'').split() + setvalue = False
meta/classes/externalsrc.bbclass +5
-5+ for cleandir in cleandirs[:]: + if d.expand(cleandir) == externalsrc: + cleandirs.remove(cleandir) setvalue = True - if externalsrcbuild == externalsrc and '${B}' in cleandirs: - cleandirs.remove('${B}') - setvalue = True - if setvalue: - d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) + if setvalue: + d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) fetch_tasks = ['do_fetch', 'do_unpack'] # If we deltask do_patch, there's no dependency to ensure do_unpack
Quoted 1 line
gets run, so add one
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre