From 226d54067efbdd9fb8299e552558c88a5e065b58 Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Thu, 21 Apr 2016 13:10:13 +0300 Subject: 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) (From OE-Core rev: ef37c7d8e4abf896aa791ee01e52a74f24aadb99) Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') 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: -- cgit v1.2.3-54-g00ecf