| Message ID | 20180427184617.19111-1-ross.burton@intel.com |
|---|---|
| State | Accepted |
| Commit | 06aaafd14f3c8e27faeea0a514f80e1ff5eb4deb |
| Headers | show |
| Series | base: improve do_unpack[cleandirs] logic | expand |
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bb1f4b75336..d5798f9c48c 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -152,7 +152,7 @@ python base_do_fetch() { addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" -do_unpack[cleandirs] = "${@d.getVar('S') if d.getVar('S') != d.getVar('WORKDIR') else os.path.join('${S}', 'patches')}" +do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" python base_do_unpack() { src_uri = (d.getVar('SRC_URI') or "").split()
If a recipe sets S to ${WORKDIR}/ then the S != WORKDIR test doesn't work as expected. Use os.path.normpath() to normalise the paths so string comparison works. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core