wic: isoimage-isohybrid: fix splash file paths

os.path.join discards the cr_workdir var contents if the path of the
second arguments is absolute.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 844058162943d77395081d575b2e1f9e8628810e..ed59d85962ff3969f5201a494451e3dc560fc57d 100644 (file)
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -60,7 +60,7 @@ class IsoImagePlugin(SourcePlugin):
         """
         Create loader-specific (syslinux) config
         """
-        splash = os.path.join(cr_workdir, "/ISO/boot/splash.jpg")
+        splash = os.path.join(cr_workdir, "ISO/boot/splash.jpg")
         if os.path.exists(splash):
             splashline = "menu background splash.jpg"
         else:
@@ -105,7 +105,7 @@ class IsoImagePlugin(SourcePlugin):
                 msger.error("configfile is specified but failed to "
                         "get it from %s." % configfile)
         else:
-            splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg")
+            splash = os.path.join(cr_workdir, "EFI/boot/splash.jpg")
             if os.path.exists(splash):
                 splashline = "menu background splash.jpg"
             else: