sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: dba099d77dcc66b239523a55f3ed26784f9a662a)

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ioan-Adrian Ratiu 2016-04-21 13:10:13 +03:00 committed by Richard Purdie
parent d73b756d82
commit 4ed22edac8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/wic/plugins/source/isoimage-isohybrid.py
View File

@ -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: