Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

This commit is contained in:
Stephan Raue 2013-03-22 12:23:03 +01:00
commit 461195b17f
7 changed files with 90 additions and 78 deletions

View File

@ -177,42 +177,47 @@ echo "#########################################################"
# create bootloader configuration
echo "creating bootloader configuration..."
echo "UI vesamenu.c32" > /tmp/usb_install/syslinux.cfg
echo "PROMPT 0" >> /tmp/usb_install/syslinux.cfg
echo "MENU TITLE OpenELEC LIVE Boot Menu" >> /tmp/usb_install/syslinux.cfg
# echo "MENU BACKGROUND splash.png" >> /tmp/usb_install/syslinux.cfg
echo "TIMEOUT 50" >> /tmp/usb_install/syslinux.cfg
echo "DEFAULT live" >> /tmp/usb_install/syslinux.cfg
echo "" >> /tmp/usb_install/syslinux.cfg
echo "MENU WIDTH 78" >> /tmp/usb_install/syslinux.cfg
echo "MENU MARGIN 4" >> /tmp/usb_install/syslinux.cfg
echo "MENU ROWS 5" >> /tmp/usb_install/syslinux.cfg
echo "MENU VSHIFT 10" >> /tmp/usb_install/syslinux.cfg
echo "MENU TIMEOUTROW 13" >> /tmp/usb_install/syslinux.cfg
echo "MENU TABMSGROW 11" >> /tmp/usb_install/syslinux.cfg
echo "MENU CMDLINEROW 11" >> /tmp/usb_install/syslinux.cfg
echo "MENU HELPMSGROW 16" >> /tmp/usb_install/syslinux.cfg
echo "MENU HELPMSGENDROW 29" >> /tmp/usb_install/syslinux.cfg
echo "" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR border 30;44 #40ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR title 1;36;44 #9033ccff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR unsel 37;44 #50ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR help 37;40 #c0ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR msg07 37;40 #90ffffff #a0000000 std" >> /tmp/usb_install/syslinux.cfg
echo "MENU COLOR tabmsg 31;40 #30ffffff #00000000 std" >> /tmp/usb_install/syslinux.cfg
echo "" >> /tmp/usb_install/syslinux.cfg
echo "LABEL installer" >> /tmp/usb_install/syslinux.cfg
echo " MENU LABEL Run OpenELEC Installer" >> /tmp/usb_install/syslinux.cfg
echo " KERNEL /KERNEL" >> /tmp/usb_install/syslinux.cfg
echo " APPEND boot=UUID=$UUID installer quiet" >> /tmp/usb_install/syslinux.cfg
echo "" >> /tmp/usb_install/syslinux.cfg
echo "LABEL live" >> /tmp/usb_install/syslinux.cfg
echo " MENU LABEL Run OpenELEC Live" >> /tmp/usb_install/syslinux.cfg
echo " KERNEL /KERNEL" >> /tmp/usb_install/syslinux.cfg
echo " APPEND boot=UUID=$UUID disk=FILE=STORAGE quiet" >> /tmp/usb_install/syslinux.cfg
cat >/tmp/usb_install/syslinux.cfg << EOF
UI vesamenu.c32
PROMPT 0
MENU TITLE Boot Menu
MENU BACKGROUND splash.png
TIMEOUT 50
DEFAULT live
MENU WIDTH 70
MENU MARGIN 15
MENU ROWS 2
MENU HSHIFT 4
MENU VSHIFT 13
MENU TIMEOUTROW 10
MENU TABMSGROW 8
MENU CMDLINEROW 8
MENU HELPMSGROW 13
MENU HELPMSGENDROW 26
MENU CLEAR
MENU COLOR border 30;44 #40ffffff #00000000 std
MENU COLOR title 1;36;44 #ff8bbfe3 #00000000 std
MENU COLOR sel 7;37;40 #80f0f0f0 #ff606060 all
MENU COLOR unsel 37;44 #50ffffff #00000000 std
MENU COLOR help 37;40 #c0ffffff #a0000000 std
MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
MENU COLOR msg07 37;40 #90ffffff #a0000000 std
MENU COLOR tabmsg 31;40 #ff868787 #00000000 std
LABEL installer
MENU LABEL Run OpenELEC Installer
KERNEL /KERNEL
APPEND boot=UUID=$UUID installer quiet
LABEL live
MENU LABEL Run OpenELEC Live
KERNEL /KERNEL
APPEND boot=UUID=$UUID disk=FILE=STORAGE,512 quiet
EOF
# copy files
echo "copying files to $PART..."
@ -228,7 +233,7 @@ echo "#########################################################"
cp RELEASE /tmp/usb_install
cp 3rdparty/syslinux/vesamenu.c32 /tmp/usb_install
# cp splash.png /tmp/usb_install
cp splash.png /tmp/usb_install
# sync disk
echo "syncing disk..."

37
packages/tools/syslinux/files/create_livestick.bat Normal file → Executable file
View File

@ -98,32 +98,37 @@ IF ERRORLEVEL 1 goto InvalidDrive
>NUL copy RELEASE %DRIVE%
>NUL copy openelec.ico %DRIVE%
>NUL copy 3rdparty/syslinux/vesamenu.c32 %DRIVE%
>NUL copy splash.png %DRIVE%
FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
ECHO UI vesamenu.c32 > %DRIVE%\syslinux.cfg
ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
ECHO MENU TITLE OpenELEC LIVE Boot Menu >> %DRIVE%\syslinux.cfg
ECHO MENU TITLE Boot Menu >> %DRIVE%\syslinux.cfg
ECHO MENU BACKGROUND splash.png >> %DRIVE%\syslinux.cfg
ECHO TIMEOUT 50 >> %DRIVE%\syslinux.cfg
ECHO DEFAULT live >> %DRIVE%\syslinux.cfg
ECHO. >> %DRIVE%\syslinux.cfg
ECHO MENU WIDTH 78 >> %DRIVE%\syslinux.cfg
ECHO MENU MARGIN 4 >> %DRIVE%\syslinux.cfg
ECHO MENU ROWS 5 >> %DRIVE%\syslinux.cfg
ECHO MENU VSHIFT 10 >> %DRIVE%\syslinux.cfg
ECHO MENU TIMEOUTROW 13 >> %DRIVE%\syslinux.cfg
ECHO MENU TABMSGROW 11 >> %DRIVE%\syslinux.cfg
ECHO MENU CMDLINEROW 11 >> %DRIVE%\syslinux.cfg
ECHO MENU HELPMSGROW 16 >> %DRIVE%\syslinux.cfg
ECHO MENU HELPMSGENDROW 29 >> %DRIVE%\syslinux.cfg
ECHO MENU WIDTH 70 >> %DRIVE%\syslinux.cfg
ECHO MENU MARGIN 15 >> %DRIVE%\syslinux.cfg
ECHO MENU ROWS 2 >> %DRIVE%\syslinux.cfg
ECHO MENU HSHIFT 4 >> %DRIVE%\syslinux.cfg
ECHO MENU VSHIFT 13 >> %DRIVE%\syslinux.cfg
ECHO MENU TIMEOUTROW 10 >> %DRIVE%\syslinux.cfg
ECHO MENU TABMSGROW 8 >> %DRIVE%\syslinux.cfg
ECHO MENU CMDLINEROW 8 >> %DRIVE%\syslinux.cfg
ECHO MENU HELPMSGROW 13 >> %DRIVE%\syslinux.cfg
ECHO MENU HELPMSGENDROW 26 >> %DRIVE%\syslinux.cfg
ECHO MENU CLEAR >> %DRIVE%\syslinux.cfg
ECHO. >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR border 30;44 #40ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR title 1;36;44 #9033ccff #a0000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR unsel 37;44 #50ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR border 30;44 #40ffffff #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR title 1;36;44 #ff8bbfe3 #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR sel 7;37;40 #80f0f0f0 #ff606060 all >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR unsel 37;44 #50ffffff #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR help 37;40 #c0ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR msg07 37;40 #90ffffff #a0000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR tabmsg 31;40 #30ffffff #00000000 std >> %DRIVE%\syslinux.cfg
ECHO MENU COLOR tabmsg 31;40 #ff868787 #00000000 std >> %DRIVE%\syslinux.cfg
ECHO. >> %DRIVE%\syslinux.cfg
ECHO LABEL installer >> %DRIVE%\syslinux.cfg
ECHO MENU LABEL Run OpenELEC Installer >> %DRIVE%\syslinux.cfg
@ -133,7 +138,7 @@ ECHO. >> %DRIVE%\syslinux.cfg
ECHO LABEL live >> %DRIVE%\syslinux.cfg
ECHO MENU LABEL Run OpenELEC Live >> %DRIVE%\syslinux.cfg
ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet >> %DRIVE%\syslinux.cfg
ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,512 quiet >> %DRIVE%\syslinux.cfg
GOTO END
:InvalidDrive

BIN
packages/tools/syslinux/files/create_livestick.exe Normal file → Executable file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

View File

@ -23,11 +23,8 @@ Section "Screen"
DefaultDepth 24
Option "ColorRange" "Full"
Option "ColorSpace" "RGB"
Option "TVStandard" "HD1080i"
SubSection "Display"
Depth 24
EndSubSection
EndSection
Section "Extensions"
Option "Composite" "false"
EndSection

View File

@ -22,7 +22,7 @@
. config/options $1
[ -f "$PKG_BUILD/git.version" ] && PKG_GIT_VERSION=`cat $PKG_BUILD/git.version`
[ -f "$PKG_BUILD/VERSION" ] && PKG_GIT_VERSION=`cat $PKG_BUILD/VERSION`
echo $PKG_GIT_VERSION

45
tools/nsis-installer/oeinstaller.nsi Normal file → Executable file
View File

@ -49,7 +49,7 @@ Var "SSH_PARAM"
!insertmacro MUI_PAGE_LICENSE "gpl-2.0.txt"
Name "${PRODUCT_NAME}"
OutFile 'create_installstick.exe'
OutFile 'create_livestick.exe'
ShowInstDetails show
AllowRootDirInstall true
RequestExecutionLevel admin
@ -114,38 +114,43 @@ Section "oeusbstart"
Delete '$DRIVE_LETTER\syslinux.cfg'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'UI vesamenu.c32'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'PROMPT 0'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TITLE OpenELEC Boot Menu'
#${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU BACKGROUND splash.png'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TITLE Boot Menu'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU BACKGROUND splash.png'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'TIMEOUT $BOOT_TIME'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'DEFAULT installer'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'DEFAULT live'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU WIDTH 78'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU MARGIN 4'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU ROWS 5'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU VSHIFT 10'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TIMEOUTROW 13'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TABMSGROW 11'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU CMDLINEROW 11'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGROW 16'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGENDROW 29'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU WIDTH 70'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU MARGIN 15'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU ROWS 2'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HSHIFT 4'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU VSHIFT 13'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TIMEOUTROW 10'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU TABMSGROW 8'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU CMDLINEROW 8'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGROW 13'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU HELPMSGENDROW 26'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU CLEAR'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR border 30;44 #40ffffff #a0000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR title 1;36;44 #9033ccff #a0000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR unsel 37;44 #50ffffff #a0000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR border 30;44 #40ffffff #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR title 1;36;44 #ff8bbfe3 #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR sel 7;37;40 #80f0f0f0 #ff606060 all'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR unsel 37;44 #50ffffff #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR help 37;40 #c0ffffff #a0000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR msg07 37;40 #90ffffff #a0000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR tabmsg 31;40 #30ffffff #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'MENU COLOR tabmsg 31;40 #ff868787 #00000000 std'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL installer'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run Installer'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run OpenELEC Installer'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' KERNEL /KERNEL'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC installer quiet'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ''
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' 'LABEL live'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run Live USB'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' MENU LABEL Run OpenELEC Live'
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' KERNEL /KERNEL'
${If} $STORAGE_SIZE == "0"
${WriteToFile} '$DRIVE_LETTER\syslinux.cfg' ' APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE quiet $SSH_PARAM'