Actually the bootimg_dir is the value of the STAGING_DATADIR, so we can use it directly.
Signed-off-by: Kevin Hao <[email protected]> --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 170077c22c21..d9c7b55f03c5 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -360,11 +360,6 @@ class IsoImagePlugin(SourcePlugin): chmod_cmd = "chmod 644 %s" % bootimg exec_cmd(chmod_cmd) - # Prepare files for legacy boot - syslinux_dir = get_bitbake_var("STAGING_DATADIR") - if not syslinux_dir: - raise WicError("Couldn't find STAGING_DATADIR, exiting.") - if os.path.exists("%s/isolinux" % isodir): shutil.rmtree("%s/isolinux" % isodir) @@ -373,19 +368,19 @@ class IsoImagePlugin(SourcePlugin): cls.do_configure_syslinux(creator, cr_workdir) - install_cmd = "install -m 444 %s/syslinux/ldlinux.sys " % syslinux_dir + install_cmd = "install -m 444 %s/syslinux/ldlinux.sys " % bootimg_dir install_cmd += "%s/isolinux/ldlinux.sys" % isodir exec_cmd(install_cmd) - install_cmd = "install -m 444 %s/syslinux/isohdpfx.bin " % syslinux_dir + install_cmd = "install -m 444 %s/syslinux/isohdpfx.bin " % bootimg_dir install_cmd += "%s/isolinux/isohdpfx.bin" % isodir exec_cmd(install_cmd) - install_cmd = "install -m 644 %s/syslinux/isolinux.bin " % syslinux_dir + install_cmd = "install -m 644 %s/syslinux/isolinux.bin " % bootimg_dir install_cmd += "%s/isolinux/isolinux.bin" % isodir exec_cmd(install_cmd) - install_cmd = "install -m 644 %s/syslinux/ldlinux.c32 " % syslinux_dir + install_cmd = "install -m 644 %s/syslinux/ldlinux.c32 " % bootimg_dir install_cmd += "%s/isolinux/ldlinux.c32" % isodir exec_cmd(install_cmd) -- 2.14.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
