diff options
| author |   Mihaly Varga <mihaly.varga@ni.com> | 2016-02-03 12:35:06 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:39:02 +0000 |
| commit | 0b82af2aed4fb9ebd85ffae1b539161c489259a7 (patch) | |
| tree | e9b5a3df80553c3aca5d89b425ef4fa6aae4885a /scripts/lib | |
| parent | 96994410fc99a583512cd7a0a29a5af19289ee29 (diff) | |
| download | openembedded-core-contrib-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.py | 7 |
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): 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") |