From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Date: Thu, 21 Apr 2016 10:10:13 +0000 (+0300)
Subject: wic: isoimage-isohybrid: fix splash file paths
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26069
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dba099d77dcc66b239523a55f3ed26784f9a662a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 84405816294..ed59d85962f 100644
--- 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: