jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generic: merge Virtual project

Browse Source
This commit is contained in:
Lukas Rusak 2017-02-01 16:47:13 -08:00 committed by chewitt
parent 524dc53ee8
commit a51188bd68
5 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distributions/LibreELEC/options
View File

@ -136,7 +136,7 @@
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy" GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy wmware"
# build and install remote support (yes / no) # build and install remote support (yes / no)
REMOTE_SUPPORT="yes" REMOTE_SUPPORT="yes"

0
projects/Virtual/config/ovf.template → projects/Generic/config/ovf.template
View File

3
projects/Generic/linux/linux.x86_64.conf
View File

@ -3256,7 +3256,8 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_I915_WERROR is not set # CONFIG_DRM_I915_WERROR is not set
# CONFIG_DRM_I915_DEBUG is not set # CONFIG_DRM_I915_DEBUG is not set
# CONFIG_DRM_VGEM is not set # CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VMWGFX is not set CONFIG_DRM_VMWGFX=y
CONFIG_DRM_VMWGFX_FBCON=y
# CONFIG_DRM_GMA500 is not set # CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_UDL is not set # CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set # CONFIG_DRM_AST is not set

2
scripts/image
View File

@ -189,7 +189,7 @@ $SCRIPTS/install network
[ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote [ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
# Virtual image creation support # Virtual image creation support
[ "$PROJECT" = Virtual ] && $SCRIPTS/install virtual [ "$PROJECT" = "Generic" ] && $SCRIPTS/install virtual
# Installer support # Installer support
[ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer

14
scripts/mkimage
View File

@ -144,18 +144,6 @@ LABEL run
APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE portable quiet APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE portable quiet
EOF EOF
if [ "$PROJECT" = Virtual ]; then
cat << EOF > "$LE_TMP"/syslinux.cfg
DEFAULT virtual
TIMEOUT 50
PROMPT 0
LABEL virtual
KERNEL /$KERNEL_NAME
APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE quiet tty vga=current
EOF
fi
mcopy "$LE_TMP/syslinux.cfg" :: mcopy "$LE_TMP/syslinux.cfg" ::
# install extlinux # install extlinux
@ -302,7 +290,7 @@ fi # bootloader
fsck -n $LE_TMP/part1.fat >"$SAVE_ERROR" 2>&1 || show_error fsck -n $LE_TMP/part1.fat >"$SAVE_ERROR" 2>&1 || show_error
# create virtual images # create virtual images
if [ "$PROJECT" = Virtual ]; then if [ "$PROJECT" = "Generic" ]; then
echo "image: creating open virtual appliance..." echo "image: creating open virtual appliance..."
qemu-img convert -O vmdk -o subformat=streamOptimized "$DISK" "$DISK.vmdk" qemu-img convert -O vmdk -o subformat=streamOptimized "$DISK" "$DISK.vmdk"
sed -e "s,@DISTRO@,$DISTRO,g" -e "s,@DISK@,$(basename $DISK),g" -e "s,@DISK_SIZE@,$(ls -l $DISK.vmdk | awk '{print $5}'),g" $PROJECT_DIR/$PROJECT/config/ovf.template > $DISK.ovf sed -e "s,@DISTRO@,$DISTRO,g" -e "s,@DISK@,$(basename $DISK),g" -e "s,@DISK_SIZE@,$(ls -l $DISK.vmdk | awk '{print $5}'),g" $PROJECT_DIR/$PROJECT/config/ovf.template > $DISK.ovf