Merge pull request #2275 from vpeter4/stuff

create_livestick: changes required for syslinux 5.01
This commit is contained in:
Stephan Raue 2013-05-08 15:21:35 -07:00
commit e1bf1f97a3
5 changed files with 19 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 ..."