mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0
This commit is contained in:
commit
31001afd23
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/device-tmpl.cpp b/device-tmpl.cpp
|
||||||
|
index 158324b..4d9f862 100644
|
||||||
|
--- a/device-tmpl.cpp
|
||||||
|
+++ b/device-tmpl.cpp
|
||||||
|
@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
|
||||||
|
fd_dvr = -1;
|
||||||
|
|
||||||
|
int n = Adapter;
|
||||||
|
- softcsa = (fd_ca < 0);
|
||||||
|
+ softcsa = true;
|
||||||
|
if (softcsa)
|
||||||
|
{
|
||||||
|
if (HasDecoder())
|
@ -25,10 +25,8 @@
|
|||||||
mkdir -p $INSTALL/usr/share/bootloader
|
mkdir -p $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/LICENCE* $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/bootcode.bin $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_BUILD/fixup.dat $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat
|
||||||
cp $PKG_BUILD/fixup_x.dat $INSTALL/usr/share/bootloader
|
cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader/start.elf
|
||||||
cp $PKG_BUILD/start.elf $INSTALL/usr/share/bootloader
|
|
||||||
cp $PKG_BUILD/start_x.elf $INSTALL/usr/share/bootloader
|
|
||||||
|
|
||||||
cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
|
cp $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
|
||||||
cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader
|
cp $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader
|
||||||
|
@ -30,12 +30,12 @@
|
|||||||
cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/fixup_x.dat $BOOT_ROOT
|
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
|
cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
|
||||||
cp $SYSTEM_ROOT/usr/share/bootloader/start_x.elf $BOOT_ROOT
|
|
||||||
|
|
||||||
# cleanup not more needed files
|
# cleanup not more needed files
|
||||||
rm -rf $BOOT_ROOT/loader.bin
|
rm -rf $BOOT_ROOT/loader.bin
|
||||||
|
rm -rf $BOOT_ROOT/fixup_x.dat
|
||||||
|
rm -rf $BOOT_ROOT/start_x.elf
|
||||||
|
|
||||||
# some config.txt magic
|
# some config.txt magic
|
||||||
if [ ! -f $BOOT_ROOT/config.txt ]; then
|
if [ ! -f $BOOT_ROOT/config.txt ]; then
|
||||||
|
@ -309,7 +309,7 @@
|
|||||||
SENSOR_SUPPORT="yes"
|
SENSOR_SUPPORT="yes"
|
||||||
|
|
||||||
# build with swap support (yes / no)
|
# build with swap support (yes / no)
|
||||||
SWAP_SUPPORT="yes"
|
SWAP_SUPPORT="no"
|
||||||
|
|
||||||
# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
|
# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
|
||||||
SWAPFILESIZE="131072"
|
SWAPFILESIZE="131072"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user