diff options
author | Ross Burton <ross.burton@intel.com> | 2018-04-25 14:57:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:38 +0100 |
commit | 06d7df6fe28485c684e478c1ed2dff32eec7c195 (patch) | |
tree | e4b84867e73d2a5e4caac02805f049f93a899326 | |
parent | 950dce692ae23826ef197816e77b555ccca629c0 (diff) | |
download | poky-06d7df6fe28485c684e478c1ed2dff32eec7c195.tar.gz |
base: improve do_unpack[cleandirs] logic
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.
(From OE-Core rev: 06aaafd14f3c8e27faeea0a514f80e1ff5eb4deb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bb1f4b7533..d5798f9c48 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -152,7 +152,7 @@ python base_do_fetch() { | |||
152 | addtask unpack after do_fetch | 152 | addtask unpack after do_fetch |
153 | do_unpack[dirs] = "${WORKDIR}" | 153 | do_unpack[dirs] = "${WORKDIR}" |
154 | 154 | ||
155 | do_unpack[cleandirs] = "${@d.getVar('S') if d.getVar('S') != d.getVar('WORKDIR') else os.path.join('${S}', 'patches')}" | 155 | 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')}" |
156 | 156 | ||
157 | python base_do_unpack() { | 157 | python base_do_unpack() { |
158 | src_uri = (d.getVar('SRC_URI') or "").split() | 158 | src_uri = (d.getVar('SRC_URI') or "").split() |