mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
63cc19754c
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-driver"
|
PKG_NAME="bcm2835-driver"
|
||||||
PKG_VERSION="99a37d1"
|
PKG_VERSION="afc05b9"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-addon-xvdr"
|
PKG_NAME="xbmc-addon-xvdr"
|
||||||
PKG_VERSION="e490332"
|
PKG_VERSION="10980dc"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-pvr-addons"
|
PKG_NAME="xbmc-pvr-addons"
|
||||||
PKG_VERSION="e3c185b"
|
PKG_VERSION="2eaf9a2"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-theme-Confluence"
|
PKG_NAME="xbmc-theme-Confluence"
|
||||||
PKG_VERSION="f14f5a5"
|
PKG_VERSION="0a59a1f"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="f14f5a5"
|
PKG_VERSION="0a59a1f"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-bootloader"
|
PKG_NAME="bcm2835-bootloader"
|
||||||
PKG_VERSION="99a37d1"
|
PKG_VERSION="afc05b9"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="arm"
|
PKG_ARCH="arm"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
@ -20,46 +20,56 @@
|
|||||||
# http://www.gnu.org/copyleft/gpl.html
|
# http://www.gnu.org/copyleft/gpl.html
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# usage: sudo ./create_virtualmachine <path> <size(MB)> [<type>]
|
# usage: sudo ./create_virtualmachine <path> <size(MB)> [<type>] [system partition size(MB)]
|
||||||
# example: sudo ./create_virtualmachine /home/test/VM 512 [vdi]
|
# example: sudo ./create_virtualmachine /home/test/VM 512 [vdi] [128]
|
||||||
|
|
||||||
if [ "$(id -u)" != "0" ]; then
|
if [ "$(id -u)" != "0" ]; then
|
||||||
clear
|
clear
|
||||||
echo "###########################################################"
|
echo "##############################################################"
|
||||||
echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #"
|
echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #"
|
||||||
echo "# example: #"
|
echo "# example: #"
|
||||||
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
|
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
|
||||||
echo "###########################################################"
|
echo "##############################################################"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$1" -o -z "$2" ]; then
|
if [ -z "$1" -o -z "$2" ]; then
|
||||||
clear
|
clear
|
||||||
echo "###########################################################"
|
echo "##############################################################"
|
||||||
echo "# please execute as follows #"
|
echo "# please execute as follows #"
|
||||||
echo "# example: #"
|
echo "# example: #"
|
||||||
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
|
echo "# sudo ./create_virtualmachine <path> <size(MB)> [<type>] #"
|
||||||
echo "###########################################################"
|
echo "##############################################################"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d "$1" ]; then
|
||||||
|
clear
|
||||||
|
echo "##############################################################"
|
||||||
|
echo "# please create target directory #"
|
||||||
|
echo "# example: #"
|
||||||
|
echo "# mkdir <path> #"
|
||||||
|
echo "##############################################################"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$2" -lt "200" -o "$2" -gt "2048" ]; then
|
if [ "$2" -lt "200" -o "$2" -gt "2048" ]; then
|
||||||
clear
|
clear
|
||||||
echo "#########################################################"
|
echo "##############################################################"
|
||||||
echo "# use a value between 200MB and 2048MB (2GB) #"
|
echo "# use a value between 200MB and 2048MB (2GB) #"
|
||||||
echo "# example: #"
|
echo "# example: #"
|
||||||
echo "# sudo ./create_virtualmachine /home/test/VM 512 #"
|
echo "# sudo ./create_virtualmachine /home/test/VM 512 #"
|
||||||
echo "#########################################################"
|
echo "##############################################################"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z "$3" -a "$3" != "vdi" -a "$3" != "vmdk" ]; then
|
if [ ! -z "$3" -a "$3" != "vdi" -a "$3" != "vmdk" ]; then
|
||||||
clear
|
clear
|
||||||
echo "#########################################################"
|
echo "##############################################################"
|
||||||
echo "# only vdi or vmdk types are supported #"
|
echo "# only vdi or vmdk types are supported #"
|
||||||
echo "# example: #"
|
echo "# example: #"
|
||||||
echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi] #"
|
echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi] #"
|
||||||
echo "#########################################################"
|
echo "##############################################################"
|
||||||
exit 1
|
exit 1
|
||||||
elif [ "$3" = "vdi" ]; then
|
elif [ "$3" = "vdi" ]; then
|
||||||
TYPE="vdi"
|
TYPE="vdi"
|
||||||
@ -67,9 +77,21 @@ elif [ -z "$3" -o "$3" = "vmdk" ]; then
|
|||||||
TYPE="vmdk"
|
TYPE="vmdk"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$4" -lt "128" -o "$4" -gt "1024" -o "$4" -gt "$2" ]; then
|
||||||
|
clear
|
||||||
|
echo "##############################################################"
|
||||||
|
echo "# use a value between 128MB and 1024MB #"
|
||||||
|
echo "# example: #"
|
||||||
|
echo "# sudo ./create_virtualmachine /home/test/VM 512 [vdi] [256] #"
|
||||||
|
echo "##############################################################"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
DISK="$1/OpenELEC.img"
|
DISK="$1/OpenELEC.img"
|
||||||
IMAGE="$1/OpenELEC.$TYPE"
|
IMAGE="$1/OpenELEC.$TYPE"
|
||||||
LOOP=$(losetup -f)
|
LOOP=$(losetup -f)
|
||||||
|
SYSTEM_PART_SIZE=$(( $4 / 8 ))
|
||||||
|
|
||||||
clear
|
clear
|
||||||
echo "#########################################################"
|
echo "#########################################################"
|
||||||
@ -101,6 +123,22 @@ echo "#########################################################"
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# this is needed to create a bootloader
|
||||||
|
which extlinux > /dev/null
|
||||||
|
if [ "$?" = "1" ]; then
|
||||||
|
clear
|
||||||
|
echo "#########################################################"
|
||||||
|
echo "# #"
|
||||||
|
echo "# OpenELEC.tv missing tool - Installation will quit #"
|
||||||
|
echo "# #"
|
||||||
|
echo "# We can't find the required tool \"extlinux\" #"
|
||||||
|
echo "# on your system. #"
|
||||||
|
echo "# Please install it via your package manager. #"
|
||||||
|
echo "# #"
|
||||||
|
echo "#########################################################"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# this is needed by syslinux
|
# this is needed by syslinux
|
||||||
which mcopy > /dev/null
|
which mcopy > /dev/null
|
||||||
if [ "$?" = "1" ]; then
|
if [ "$?" = "1" ]; then
|
||||||
@ -185,7 +223,7 @@ echo "#########################################################"
|
|||||||
|
|
||||||
# create an image
|
# create an image
|
||||||
echo "creating new empty harddisk image: $DISK..."
|
echo "creating new empty harddisk image: $DISK..."
|
||||||
dd if=/dev/zero of="$DISK" bs=1M count=1024
|
dd if=/dev/zero of="$DISK" bs=1M count="$2"
|
||||||
|
|
||||||
# write a disklabel
|
# write a disklabel
|
||||||
echo "creating new partition table: $DISK..."
|
echo "creating new partition table: $DISK..."
|
||||||
@ -194,11 +232,11 @@ echo "#########################################################"
|
|||||||
|
|
||||||
# create partition1
|
# create partition1
|
||||||
echo "creating partition1 on $DISK..."
|
echo "creating partition1 on $DISK..."
|
||||||
parted -s "$LOOP" unit cyl mkpart primary ext2 -- 0 16
|
parted -s "$LOOP" unit cyl mkpart primary ext2 -- 0 "$SYSTEM_PART_SIZE"
|
||||||
|
|
||||||
# create partition2
|
# create partition2
|
||||||
echo "creating partition2 on $DISK..."
|
echo "creating partition2 on $DISK..."
|
||||||
parted -s "$LOOP" unit cyl mkpart primary ext2 -- 16 -2
|
parted -s "$LOOP" unit cyl mkpart primary ext2 -- "$(( $SYSTEM_PART_SIZE + 1 ))" -2
|
||||||
|
|
||||||
# make partition1 active (bootable)
|
# make partition1 active (bootable)
|
||||||
echo "marking partition1 active..."
|
echo "marking partition1 active..."
|
||||||
|
@ -312,6 +312,7 @@ CONFIG_MACH_BCM2708=y
|
|||||||
CONFIG_BCM2708_GPIO=y
|
CONFIG_BCM2708_GPIO=y
|
||||||
CONFIG_BCM2708_VCMEM=y
|
CONFIG_BCM2708_VCMEM=y
|
||||||
# CONFIG_BCM2708_NOL2CACHE is not set
|
# CONFIG_BCM2708_NOL2CACHE is not set
|
||||||
|
CONFIG_BCM2708_DMAER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Processor Type
|
# Processor Type
|
||||||
@ -378,9 +379,11 @@ CONFIG_FLATMEM_MANUAL=y
|
|||||||
CONFIG_FLATMEM=y
|
CONFIG_FLATMEM=y
|
||||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||||
CONFIG_HAVE_MEMBLOCK=y
|
CONFIG_HAVE_MEMBLOCK=y
|
||||||
|
CONFIG_MEMORY_ISOLATION=y
|
||||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||||
# CONFIG_COMPACTION is not set
|
# CONFIG_COMPACTION is not set
|
||||||
|
CONFIG_MIGRATION=y
|
||||||
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
||||||
CONFIG_ZONE_DMA_FLAG=0
|
CONFIG_ZONE_DMA_FLAG=0
|
||||||
CONFIG_VIRT_TO_BUS=y
|
CONFIG_VIRT_TO_BUS=y
|
||||||
@ -687,7 +690,19 @@ CONFIG_EXTRA_FIRMWARE=""
|
|||||||
# CONFIG_SYS_HYPERVISOR is not set
|
# CONFIG_SYS_HYPERVISOR is not set
|
||||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||||
# CONFIG_DMA_SHARED_BUFFER is not set
|
# CONFIG_DMA_SHARED_BUFFER is not set
|
||||||
# CONFIG_CMA is not set
|
CONFIG_CMA=y
|
||||||
|
# CONFIG_CMA_DEBUG is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# Default contiguous memory area size:
|
||||||
|
#
|
||||||
|
CONFIG_CMA_SIZE_MBYTES=16
|
||||||
|
CONFIG_CMA_SIZE_SEL_MBYTES=y
|
||||||
|
# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
|
||||||
|
# CONFIG_CMA_SIZE_SEL_MIN is not set
|
||||||
|
# CONFIG_CMA_SIZE_SEL_MAX is not set
|
||||||
|
CONFIG_CMA_ALIGNMENT=8
|
||||||
|
CONFIG_CMA_AREAS=7
|
||||||
# CONFIG_CONNECTOR is not set
|
# CONFIG_CONNECTOR is not set
|
||||||
# CONFIG_MTD is not set
|
# CONFIG_MTD is not set
|
||||||
# CONFIG_PARPORT is not set
|
# CONFIG_PARPORT is not set
|
||||||
@ -1039,6 +1054,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
|
|||||||
# CONFIG_RAW_DRIVER is not set
|
# CONFIG_RAW_DRIVER is not set
|
||||||
# CONFIG_TCG_TPM is not set
|
# CONFIG_TCG_TPM is not set
|
||||||
CONFIG_BRCM_CHAR_DRIVERS=y
|
CONFIG_BRCM_CHAR_DRIVERS=y
|
||||||
|
CONFIG_BCM_VC_CMA=y
|
||||||
CONFIG_I2C=y
|
CONFIG_I2C=y
|
||||||
CONFIG_I2C_BOARDINFO=y
|
CONFIG_I2C_BOARDINFO=y
|
||||||
# CONFIG_I2C_COMPAT is not set
|
# CONFIG_I2C_COMPAT is not set
|
||||||
|
Loading…
x
Reference in New Issue
Block a user