diff --git a/packages/tools/syslinux/files/create_livestick b/packages/tools/syslinux/files/create_livestick index 85e0fa8800..3ea77dceee 100755 --- a/packages/tools/syslinux/files/create_livestick +++ b/packages/tools/syslinux/files/create_livestick @@ -245,6 +245,19 @@ EOF cp /usr/share/syslinux/vesamenu.c32 /tmp/usb_install else echo "ERROR: Can't find syslinux's vesamenu.c32 on Host OS" >&2 + sed 's|^UI vesamenu.c32|#UI vesamenu.c32|g' /tmp/usb_install/syslinux.cfg + fi + + if [ -f /usr/lib/syslinux/libcom32.c32 ]; then + cp /usr/lib/syslinux/libcom32.c32 /tmp/usb_install + elif [ -f /usr/share/syslinux/libcom32.c32 ]; then + cp /usr/share/syslinux/libcom32.c32 /tmp/usb_install + fi + + if [ -f /usr/lib/syslinux/libutil.c32 ]; then + cp /usr/lib/syslinux/libutil.c32 /tmp/usb_install + elif [ -f /usr/share/syslinux/libutil.c32 ]; then + cp /usr/share/syslinux/libutil.c32 /tmp/usb_install fi # sync disk diff --git a/packages/tools/syslinux/files/create_livestick.bat b/packages/tools/syslinux/files/create_livestick.bat index 37521d2cc3..016820c314 100644 --- a/packages/tools/syslinux/files/create_livestick.bat +++ b/packages/tools/syslinux/files/create_livestick.bat @@ -98,6 +98,8 @@ IF ERRORLEVEL 1 goto InvalidDrive >NUL copy RELEASE %DRIVE% >NUL copy openelec.ico %DRIVE% >NUL copy 3rdparty\syslinux\vesamenu.c32 %DRIVE% +>NUL copy 3rdparty\syslinux\libcom32.c32 %DRIVE% +>NUL copy 3rdparty\syslinux\libutil.c32 %DRIVE% >NUL copy splash.png %DRIVE% FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G diff --git a/packages/tools/syslinux/files/create_livestick.exe b/packages/tools/syslinux/files/create_livestick.exe index 7355010024..6d6ee6948c 100644 Binary files a/packages/tools/syslinux/files/create_livestick.exe and b/packages/tools/syslinux/files/create_livestick.exe differ diff --git a/packages/tools/syslinux/release b/packages/tools/syslinux/release index ad9d02b56a..7da6013399 100755 --- a/packages/tools/syslinux/release +++ b/packages/tools/syslinux/release @@ -26,6 +26,8 @@ mkdir -p $RELEASE_DIR/3rdparty/syslinux cp -PR $BUILD/syslinux-*/NEWS $RELEASE_DIR/3rdparty/syslinux cp -PR $BUILD/syslinux-*/README $RELEASE_DIR/3rdparty/syslinux cp -PR $BUILD/syslinux-*/com32/menu/vesamenu.c32 $RELEASE_DIR/3rdparty/syslinux + cp -PR $BUILD/syslinux-*/com32/lib/libcom32.c32 $RELEASE_DIR/3rdparty/syslinux + cp -PR $BUILD/syslinux-*/com32/libutil/libutil.c32 $RELEASE_DIR/3rdparty/syslinux mkdir -p $RELEASE_DIR/3rdparty/syslinux/doc cp -PR $BUILD/syslinux-*/doc/* $RELEASE_DIR/3rdparty/syslinux/doc diff --git a/tools/nsis-installer/oeinstaller.nsi b/tools/nsis-installer/oeinstaller.nsi index 8ce3800c79..b156aa2829 100644 --- a/tools/nsis-installer/oeinstaller.nsi +++ b/tools/nsis-installer/oeinstaller.nsi @@ -108,6 +108,8 @@ Section "oeusbstart" nsExec::Exec `"$0" /c copy README.md $DRIVE_LETTER` nsExec::Exec `"$0" /c copy RELEASE $DRIVE_LETTER` nsExec::Exec `"$0" /c copy 3rdparty\syslinux\vesamenu.c32 $DRIVE_LETTER` + nsExec::Exec `"$0" /c copy 3rdparty\syslinux\libcom32.c32 $DRIVE_LETTER` + nsExec::Exec `"$0" /c copy 3rdparty\syslinux\libutil.c32 $DRIVE_LETTER` nsExec::Exec `"$0" /c copy splash.png $DRIVE_LETTER` DetailPrint "- Creating Bootloader configuration ..."