summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorMihaly Varga <mihaly.varga@ni.com>2016-02-03 12:35:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:02 +0000
commit0b82af2aed4fb9ebd85ffae1b539161c489259a7 (patch)
treee9b5a3df80553c3aca5d89b425ef4fa6aae4885a /scripts/lib
parent96994410fc99a583512cd7a0a29a5af19289ee29 (diff)
downloadpoky-0b82af2aed4fb9ebd85ffae1b539161c489259a7.tar.gz
wic: isoimage-isohybrid: check for syslinux-native
.iso image creation fails if during the image creation syslinux is baked and syslinux-native is not. Added new check to verify if both syslinux and syslinux-native are baked and bake them if these are not installed. (From OE-Core rev: fd5749832960ad3b85697c2878490d6f008982a3) Signed-off-by: Mihaly Varga <mihaly.varga@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')
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index c1e2a5dff1..62385a223d 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -208,11 +208,14 @@ class IsoImagePlugin(SourcePlugin):
208 if not os.path.exists("%s/syslinux" % syslinux_dir): 208 if not os.path.exists("%s/syslinux" % syslinux_dir):
209 msger.info("Building syslinux...\n") 209 msger.info("Building syslinux...\n")
210 exec_cmd("bitbake syslinux") 210 exec_cmd("bitbake syslinux")
211 msger.info("Building syslinux-native...\n")
212 exec_cmd("bitbake syslinux-native")
213 if not os.path.exists("%s/syslinux" % syslinux_dir): 211 if not os.path.exists("%s/syslinux" % syslinux_dir):
214 msger.error("Please build syslinux first\n") 212 msger.error("Please build syslinux first\n")
215 213
214 # Make sure syslinux is available in native sysroot
215 if not os.path.exists("%s/usr/bin/syslinux" % native_sysroot):
216 msger.info("Building syslinux-native...\n")
217 exec_cmd("bitbake syslinux-native")
218
216 #Make sure mkisofs is available in native sysroot 219 #Make sure mkisofs is available in native sysroot
217 if not os.path.isfile("%s/usr/bin/mkisofs" % native_sysroot): 220 if not os.path.isfile("%s/usr/bin/mkisofs" % native_sysroot):
218 msger.info("Building cdrtools-native...\n") 221 msger.info("Building cdrtools-native...\n")