From: Ross Burton <ross.burton@intel.com>
Date: Wed, 25 Apr 2018 13:57:29 +0000 (+0100)
Subject: base: improve do_unpack[cleandirs] logic
X-Git-Tag: uninative-2.0~58
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=06aaafd14f3c8e27faeea0a514f80e1ff5eb4deb;p=openembedded-core.git

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

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() {
 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()