diff --git a/packages/linux-firmware/slice-firmware/package.mk b/packages/linux-firmware/slice-firmware/package.mk index 704481429e..44539097ab 100644 --- a/packages/linux-firmware/slice-firmware/package.mk +++ b/packages/linux-firmware/slice-firmware/package.mk @@ -33,13 +33,13 @@ PKG_AUTORECONF="no" make_target() { if [ "$DEVICE" = "Slice3" ]; then - dtc -O dtb -I dts -o dt-blob.bin slice3-dt-blob.dts + $(kernel_path)/scripts/dtc/dtc -O dtb -I dts -o dt-blob.bin slice3-dt-blob.dts elif [ "$DEVICE" = "Slice" ]; then - dtc -O dtb -I dts -o dt-blob.bin slice-dt-blob.dts + $(kernel_path)/scripts/dtc/dtc -O dtb -I dts -o dt-blob.bin slice-dt-blob.dts fi } makeinstall_target() { mkdir -p $INSTALL/usr/share/bootloader/ - cp -a dt-blob.bin $INSTALL/usr/share/bootloader/ + cp -a $PKG_BUILD/dt-blob.bin $INSTALL/usr/share/bootloader/ } diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index efa80c96ca..b664698d07 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -323,6 +323,9 @@ post_makeinstall_target() { xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.libreelec.tv" $ADDON_MANIFEST xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.retroplayer.libreelec.tv" $ADDON_MANIFEST xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "service.libreelec.settings" $ADDON_MANIFEST + if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then + xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "service.slice" $ADDON_MANIFEST + fi # more binaddons cross compile badness meh sed -e "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR $SYSROOT_PREFIX/usr/include/kodi:g" \ diff --git a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch new file mode 100644 index 0000000000..cd4d881ee9 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch @@ -0,0 +1,10 @@ +--- a/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-21 22:09:04.765734381 +0400 ++++ b/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-22 16:12:57.942164800 +0400 +@@ -100,7 +100,6 @@ + #endif + SetControlLabel(i++, "%s: %s", 12390, SYSTEM_UPTIME); + SetControlLabel(i++, "%s: %s", 12394, SYSTEM_TOTALUPTIME); +- SetControlLabel(i++, "%s: %s", 12395, SYSTEM_BATTERY_LEVEL); + } + else if (m_section == CONTROL_BT_STORAGE) + { diff --git a/packages/tools/led_tools/package.mk b/packages/tools/led_tools/package.mk index 173f5389d6..dafc7e65d5 100644 --- a/packages/tools/led_tools/package.mk +++ b/packages/tools/led_tools/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.fiveninjas.com" PKG_URL="http://updates.fiveninjas.com/src/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain zlib libpng" +PKG_DEPENDS_TARGET="toolchain zlib libpng slice-addon" PKG_DEPENDS_HOST="toolchain" PKG_SECTION="tools" PKG_SHORTDESC="led_tools" diff --git a/packages/tools/slice-addon/package.mk b/packages/tools/slice-addon/package.mk new file mode 100644 index 0000000000..237acd7f6c --- /dev/null +++ b/packages/tools/slice-addon/package.mk @@ -0,0 +1,43 @@ +################################################################################ +# This file is part of LibreELEC - https://libreelec.tv +# Copyright (C) 2016-present Team LibreELEC +# +# LibreELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# LibreELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LibreELEC. If not, see . +################################################################################ + +PKG_NAME="slice-addon" +PKG_VERSION="1.0" +PKG_REV="101" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="" +PKG_URL="" +PKG_DEPENDS_TARGET="" +PKG_SHORTDESC="Controls the LED lights on the Slice box using Kodi actions" +PKG_LONGDESC="Controls the LED lights on the Slice box using Kodi actions" +PKG_AUTORECONF="no" + +PKG_IS_ADDON="no" + +make_target() { +( + cd $ROOT + scripts/create_addon slice +) +} + +makeinstall_target() { + mkdir -p $INSTALL/usr/share/kodi/addons + cp -R $BUILD/$ADDONS/slice/service.slice $INSTALL/usr/share/kodi/addons +} diff --git a/projects/RPi/devices/Slice/filesystem/usr/config/shutdown.sh b/projects/RPi/devices/Slice/filesystem/usr/config/shutdown.sh index ebd32374e6..2c597f1186 100644 --- a/projects/RPi/devices/Slice/filesystem/usr/config/shutdown.sh +++ b/projects/RPi/devices/Slice/filesystem/usr/config/shutdown.sh @@ -1,22 +1,18 @@ #!/bin/bash -if [ -f /storage/.kodi/media/ledpatterns/shutdown.png ]; then - LEDDIR=/storage/.kodi -else - LEDDIR=/usr/share/kodi -fi +LEDDIR="/usr/share/kodi/addons/service.slice/resources/media/ledpatterns" case "$1" in halt) hdparm -y /dev/sda - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; poweroff) hdparm -y /dev/sda - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; reboot) - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; *) ;; diff --git a/projects/RPi/devices/Slice/linux b/projects/RPi/devices/Slice/linux new file mode 120000 index 0000000000..588bc44b88 --- /dev/null +++ b/projects/RPi/devices/Slice/linux @@ -0,0 +1 @@ +../RPi/linux \ No newline at end of file diff --git a/projects/RPi/devices/Slice/linux/linux.arm.conf b/projects/RPi/devices/Slice/linux/linux.arm.conf deleted file mode 120000 index 15e9a3933d..0000000000 --- a/projects/RPi/devices/Slice/linux/linux.arm.conf +++ /dev/null @@ -1 +0,0 @@ -../../RPi/linux/linux.arm.conf \ No newline at end of file diff --git a/projects/RPi/devices/Slice/patches/kodi/kodi-004-keyboard.patch b/projects/RPi/devices/Slice/patches/kodi/kodi-004-keyboard.patch new file mode 100644 index 0000000000..d5434ebf74 --- /dev/null +++ b/projects/RPi/devices/Slice/patches/kodi/kodi-004-keyboard.patch @@ -0,0 +1,45 @@ +--- a/system/keymaps/keyboard.xml 2016-09-17 16:35:20.000000000 +0100 ++++ b/system/keymaps/keyboard.xml 2016-10-01 19:31:07.928719606 +0100 +@@ -56,7 +56,7 @@ + Menu + ContextMenu + Menu +- Pause ++ PlayPause + Stop + SkipNext + SkipPrevious +@@ -321,8 +321,8 @@ + NextSubtitle + StepBack + StepForward +- ChapterOrBigStepForward +- ChapterOrBigStepBack ++ VolumeUp ++ VolumeDown + AudioNextLanguage + NextSubtitle + AudioDelay +@@ -425,8 +425,8 @@ + StepForward + Rewind + FastForward +- SkipNext +- SkipPrevious ++ VolumeUp ++ VolumeDown + PlayerProcessInfo + LockPreset + FullScreen +@@ -632,8 +632,8 @@ + + StepBack + StepForward +- Up +- Down ++ VolumeUp ++ VolumeDown + OSD + OSD + ActivateWindow(PVROSDChannels) + diff --git a/projects/RPi/devices/Slice3/filesystem/usr/config/shutdown.sh b/projects/RPi/devices/Slice3/filesystem/usr/config/shutdown.sh index ebd32374e6..2c597f1186 100644 --- a/projects/RPi/devices/Slice3/filesystem/usr/config/shutdown.sh +++ b/projects/RPi/devices/Slice3/filesystem/usr/config/shutdown.sh @@ -1,22 +1,18 @@ #!/bin/bash -if [ -f /storage/.kodi/media/ledpatterns/shutdown.png ]; then - LEDDIR=/storage/.kodi -else - LEDDIR=/usr/share/kodi -fi +LEDDIR="/usr/share/kodi/addons/service.slice/resources/media/ledpatterns" case "$1" in halt) hdparm -y /dev/sda - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; poweroff) hdparm -y /dev/sda - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; reboot) - led_png $LEDDIR/media/ledpatterns/shutdown.png + led_png $LEDDIR/shutdown.png ;; *) ;; diff --git a/projects/RPi/devices/Slice3/linux b/projects/RPi/devices/Slice3/linux new file mode 120000 index 0000000000..e48fcfd9f8 --- /dev/null +++ b/projects/RPi/devices/Slice3/linux @@ -0,0 +1 @@ +../RPi2/linux \ No newline at end of file diff --git a/projects/RPi/devices/Slice3/linux/linux.arm.conf b/projects/RPi/devices/Slice3/linux/linux.arm.conf deleted file mode 120000 index bbe61a7104..0000000000 --- a/projects/RPi/devices/Slice3/linux/linux.arm.conf +++ /dev/null @@ -1 +0,0 @@ -../../RPi2/linux/linux.arm.conf \ No newline at end of file diff --git a/projects/RPi/devices/Slice3/patches/kodi/kodi-004-keyboard.patch b/projects/RPi/devices/Slice3/patches/kodi/kodi-004-keyboard.patch new file mode 100644 index 0000000000..d5434ebf74 --- /dev/null +++ b/projects/RPi/devices/Slice3/patches/kodi/kodi-004-keyboard.patch @@ -0,0 +1,45 @@ +--- a/system/keymaps/keyboard.xml 2016-09-17 16:35:20.000000000 +0100 ++++ b/system/keymaps/keyboard.xml 2016-10-01 19:31:07.928719606 +0100 +@@ -56,7 +56,7 @@ + Menu + ContextMenu + Menu +- Pause ++ PlayPause + Stop + SkipNext + SkipPrevious +@@ -321,8 +321,8 @@ + NextSubtitle + StepBack + StepForward +- ChapterOrBigStepForward +- ChapterOrBigStepBack ++ VolumeUp ++ VolumeDown + AudioNextLanguage + NextSubtitle + AudioDelay +@@ -425,8 +425,8 @@ + StepForward + Rewind + FastForward +- SkipNext +- SkipPrevious ++ VolumeUp ++ VolumeDown + PlayerProcessInfo + LockPreset + FullScreen +@@ -632,8 +632,8 @@ + + StepBack + StepForward +- Up +- Down ++ VolumeUp ++ VolumeDown + OSD + OSD + ActivateWindow(PVROSDChannels) +