commit 5f445543ef94d2e4bd05766972672ee59bce88b5
author Alexander Zilberkant <alexander.zilberkant@arm.com> Tue Oct 02 18:44:06 2018 +0300
committer Tamas Ban <tamas.ban@arm.com> Fri Oct 12 16:19:36 2018 +0200
tree b9aeeaa32418de0e313ae815dd48da358ee4773c
parent b3b9d951bcb14fda3cc96e45670800c5f69f34b9

Fix windows compilation

Path concatenation was wrong. Layout path was received as full path
and was concatenated to script directory path

Fix: do not prepend script directory path in case full path is received.

Issue reproduced on MSYS2

Change-Id: I5f627b5befcc56f4487dbfaaa1e2d9e1dd655103
Signed-off-by: Alexander Zilberkant <alexander.zilberkant@arm.com>

bl2/ext/mcuboot/scripts/assemble.py

diff --git a/bl2/ext/mcuboot/scripts/assemble.py b/bl2/ext/mcuboot/scripts/assemble.py
index 9c48092..0bb41f1 100644
--- a/bl2/ext/mcuboot/scripts/assemble.py
+++ b/bl2/ext/mcuboot/scripts/assemble.py
@@ -44,8 +44,11 @@
         offsets = {}
         sizes = {}
 
-        scriptsDir = os.path.dirname(os.path.abspath(__file__))
-        configFile = os.path.join(scriptsDir, self.layout_path)
+        if os.path.isabs(self.layout_path):
+            configFile = self.layout_path
+        else:
+            scriptsDir = os.path.dirname(os.path.abspath(__file__))
+            configFile = os.path.join(scriptsDir, self.layout_path)
 
         with open(configFile, 'r') as fd:
             for line in fd: