Merge pull request #40 from osmc/master

Update

installer/noobs/os-pi1.json

@@ -1,8 +1,8 @@
 {
 	"name": "OSMC_Pi1",
 	"url":	"https://osmc.tv",
-	"version": "2018.12-1",
-	"release_date": "2018-12-31",
+	"version": "2019.04-1",
+	"release_date": "2019-04-21",
 	"kernel": "4.14.78",
 	"description": "A fast and feature filled open source media center",
 	"username": "osmc",

installer/noobs/os-pi2.json

@@ -1,8 +1,8 @@
 {
 	"name": "OSMC_Pi2",
 	"url":	"https://osmc.tv",
-	"version": "2018.12-1",
-	"release_date": "2018-12-31",
+	"version": "2019.04-1",
+	"release_date": "2019-04-21",
 	"kernel": "4.14.78",
 	"description": "A fast and feature filled open source media center",
 	"username": "osmc",

installer/target/Makefile

@@ -1,24 +1,18 @@
 all:
-	@echo "Specify a target:\nmake rbp1\nmake rbp2\nmake vero1\nmake appletv\nmake vero2\nmake vero3"
+	@echo "Specify a target:\nmake rbp1\nmake rbp2\nmake vero2\nmake vero3"
 
 rbp1:
 	sudo bash build.sh "rbp1"
 
 rbp2:
 	sudo bash build.sh "rbp2"
 
-vero1:
-	sudo bash build.sh "vero1"
-
 vero2:
 	sudo bash build.sh "vero2"
 
 vero3:
 	sudo bash build.sh "vero3"
 
-appletv:
-	sudo bash build.sh "appletv"
-
 clean:
 	sudo rm -rf buildroot*/ > /dev/null 2>&1
 	sudo rm -f filesystem.tar.xz >/dev/null 2>&1

installer/target/build.sh

@@ -68,7 +68,7 @@ else
 fi
 if [ ! -f ../../../filesystem.tar.xz ]; then echo -e "No filesystem available for target" && exit 1; fi
 echo -e "Building disk image"
-if [ "$1" == "rbp1" ] || [ "$1" == "rbp2" ] || [ "$1" == "vero1" ] || [ "$1" == "vero2" ] || [ "$1" == "vero3" ]; then size=256; fi
+if [ "$1" == "rbp1" ] || [ "$1" == "rbp2" ] || [ "$1" == "vero2" ] || [ "$1" == "vero3" ]; then size=256; fi
 date=$(date +%Y%m%d)
 if [ "$1" == "rbp1" ] || [ "$1" == "rbp2" ] || [ "$1" == "vero1" ] || [ "$1" == "vero2" ] || [ "$1" == "vero3" ]
 then
@@ -88,13 +88,6 @@ then
 	mv *.dtb /mnt
 	mv overlays /mnt
 fi
-if [ "$1" == "vero1" ]
-then
-	echo -e "Installing Vero files"
-	mv zImage /mnt
-	mv *.dtb /mnt
-	echo "mmcargs=setenv bootargs console=tty1 root=/dev/ram0 quiet init=/init loglevel=2 osmcdev=vero1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32" > /mnt/uEnv.txt
-fi
 if [ "$1" == "vero2" ]
 then
 	echo -e "Installing Vero 2 files"
@@ -112,12 +105,6 @@ mv $(pwd)/../../../filesystem.tar.xz /mnt/
 umount /mnt
 sync
 kpartx -d OSMC_TGT_${1}_${date}.img
-if [ "$1" == "vero1" ]
-then
-	echo -e "Flashing bootloader"
-	dd conv=notrunc if=SPL of=OSMC_TGT_${1}_${date}.img bs=1K seek=1
-	dd conv=notrunc if=u-boot.img of=OSMC_TGT_${1}_${date}.img bs=1K seek=42
-fi
 echo -e "Compressing image"
 gzip OSMC_TGT_${1}_${date}.img
 md5sum OSMC_TGT_${1}_${date}.img.gz > OSMC_TGT_${1}_${date}.md5

installer/target/qt_target/qt_target_installer/extractworker.cpp

@@ -21,7 +21,11 @@ void ExtractWorker::extract()
     process = new QProcess();
     connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(readFromStdOut()));
     connect(process, SIGNAL(readyReadStandardError()), this, SLOT(readFromStdErr()));
-    process->start("/bin/sh -c \"/usr/bin/pv -n " + sourceName + " | tar xJf - -C " + destName + "\"");
+    if (sourceName.endsWith("xz"))
+        process->start("/bin/sh -c \"/usr/bin/pv -n " + sourceName + " | tar xJf - -C " + destName + "\"");
+    else
+        process->start("/bin/sh -c \"/usr/bin/pv -n " + sourceName + " | tar xf - -C " + destName + "\"");
+
     process->waitForFinished(-1);
     if (process->exitCode() != 0)
     {

installer/target/qt_target/qt_target_installer/init

@@ -70,6 +70,19 @@ then
 	esac
 	done
 
+	preferred=$(busybox grep \* /sys/class/amhdmitx/amhdmitx0/disp_cap | busybox sed 's/\*//g')
+	if echo $hdmimode | busybox grep -q force
+	then
+    		hdmimode=$(echo $hdmimode | /bin/busybox sed 's/force//g')
+    		echo "$hdmimode" > /sys/class/display/mode
+	else
+	if [ "$preferred" ] && [ "$hdmimode" != "$preferred" ]
+	then
+  		hdmimode="$preferred"
+  		echo "$hdmimode" > /sys/class/display/mode
+	fi
+fi
+
 	# Configure framebuffer X and Y size
 
 	case $hdmimode in

installer/target/qt_target/qt_target_installer/mainwindow.cpp

@@ -104,12 +104,16 @@ void MainWindow::install()
         haltInstall("could not mount bootfs");
         return;
     }
-    /* Sanity check: need filesystem.tar.xz */
+    /* Sanity check: need filesystem.tar.xz or filesystem.tar */
     QFile fileSystem(QString(MNT_BOOT) + "/filesystem.tar.xz");
     if (! fileSystem.exists())
     {
-        haltInstall("no filesystem found");
-        return;
+        QFile fileSystem(QString(MNT_BOOT) + "/filesystem.tar");
+        if (! fileSystem.exists())
+        {
+            haltInstall("no filesystem found");
+            return;
+        }
     }
     /* Load in preseeded values */
     preseed = new PreseedParser();

package/base-files-osmc/files/DEBIAN/control

@@ -1,6 +1,6 @@
 Origin: OSMC
 Package: base-files-osmc
-Version: 2.7.5
+Version: 2.7.6
 Section: admin
 Priority: required
 Architecture: all

package/base-files-osmc/files/etc/os-release

@@ -1,7 +1,7 @@
 PRETTY_NAME="Open Source Media Center"
 NAME="OSMC"
-VERSION="December 2018"
-VERSION_ID="2018.12-1"
+VERSION="April 2019"
+VERSION_ID="2019.04-1"
 ID=osmc
 ID_LIKE=debian
 

package/eventlircd-osmc/files/DEBIAN/control

@@ -1,5 +1,5 @@
 Origin: OSMC
-Version: 1.3.3
+Version: 1.3.4
 Section: utils
 Essential: No
 Priority: optional

package/eventlircd-osmc/files/lib/udev/rules.d/98-eventlircd.rules

@@ -243,4 +243,7 @@ LABEL="begin-bluetooth"
 
 LABEL="end-bluetooth"
 
+# tell libinput to ignore devices handled by eventlircd
+ENV{eventlircd_enable}=="true", ENV{LIBINPUT_IGNORE_DEVICE}="1"
+
 LABEL="end"

package/ftr-osmc/Makefile

@@ -1,18 +1,12 @@
 all:
-        @echo "Specify a target:\nmake rbp1\nmake rbp2\nmake atv\nmake vero1\nmake vero2\nmake vero3"
+        @echo "Specify a target:\nmake rbp1\nmake rbp2\nmake vero2\nmake vero3"
 
 rbp1:
 	sudo bash build.sh "rbp1"
 
 rbp2:
 	sudo bash build.sh "rbp2"
 
-atv:
-	sudo setarch i686 bash build.sh "atv"
-
-vero1:
-	sudo bash build.sh "vero1"
-
 vero2:
 	sudo bash build.sh "vero2"