From 0b82af2aed4fb9ebd85ffae1b539161c489259a7 Mon Sep 17 00:00:00 2001 From: Mihaly Varga Date: Wed, 3 Feb 2016 12:35:06 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/lib/wic') 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): if not os.path.exists("%s/syslinux" % syslinux_dir): msger.info("Building syslinux...\n") exec_cmd("bitbake syslinux") - msger.info("Building syslinux-native...\n") - exec_cmd("bitbake syslinux-native") if not os.path.exists("%s/syslinux" % syslinux_dir): msger.error("Please build syslinux first\n") + # Make sure syslinux is available in native sysroot + if not os.path.exists("%s/usr/bin/syslinux" % native_sysroot): + msger.info("Building syslinux-native...\n") + exec_cmd("bitbake syslinux-native") + #Make sure mkisofs is available in native sysroot if not os.path.isfile("%s/usr/bin/mkisofs" % native_sysroot): msger.info("Building cdrtools-native...\n") -- cgit v1.2.3-54-g00ecf