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:58:44 +0100 |
commit | 4ed22edac81797fb9e93c736318aba8f621f7c2b (patch) | |
tree | 59ea99ac05eec0204ac85d6c006ea0ae4d1313d1 /scripts/lib/wic/plugins | |
parent | d73b756d822f29c7616a9e86e5fe422f63d3512e (diff) | |
download | poky-4ed22edac81797fb9e93c736318aba8f621f7c2b.tar.gz |
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>
Diffstat (limited to 'scripts/lib/wic/plugins')
-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): | |||
60 | """ | 60 | """ |
61 | Create loader-specific (syslinux) config | 61 | Create loader-specific (syslinux) config |
62 | """ | 62 | """ |
63 | splash = os.path.join(cr_workdir, "/ISO/boot/splash.jpg") | 63 | splash = os.path.join(cr_workdir, "ISO/boot/splash.jpg") |
64 | if os.path.exists(splash): | 64 | if os.path.exists(splash): |
65 | splashline = "menu background splash.jpg" | 65 | splashline = "menu background splash.jpg" |
66 | else: | 66 | else: |
@@ -105,7 +105,7 @@ class IsoImagePlugin(SourcePlugin): | |||
105 | msger.error("configfile is specified but failed to " | 105 | msger.error("configfile is specified but failed to " |
106 | "get it from %s." % configfile) | 106 | "get it from %s." % configfile) |
107 | else: | 107 | else: |
108 | splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg") | 108 | splash = os.path.join(cr_workdir, "EFI/boot/splash.jpg") |
109 | if os.path.exists(splash): | 109 | if os.path.exists(splash): |
110 | splashline = "menu background splash.jpg" | 110 | splashline = "menu background splash.jpg" |
111 | else: | 111 | else: |