diff options
| author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2016-04-21 13:10:13 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-29 07:53:57 +0100 |
| commit | dba099d77dcc66b239523a55f3ed26784f9a662a (patch) | |
| tree | 8eae1ee9e54adad5ced055ec98c8b56274d859fe | |
| parent | 94f61c2682e5cfd819ac84535650c3e0a654415a (diff) | |
| download | openembedded-core-dba099d77dcc66b239523a55f3ed26784f9a662a.tar.gz openembedded-core-dba099d77dcc66b239523a55f3ed26784f9a662a.tar.bz2 openembedded-core-dba099d77dcc66b239523a55f3ed26784f9a662a.zip | |
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>
| -rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 8440581629..ed59d85962 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: |