diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch new file mode 100644 index 0000000000..00e6a9ca8a --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-03_don-t-build-unused-plugins.patch @@ -0,0 +1,29 @@ +From 61c795e71df00f4d3c22d2be405ceb0eb0e0e49c Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Fri, 22 Nov 2013 21:45:56 +0200 +Subject: [PATCH] don't build unused plugins + +--- + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 118e379..5f15ebe 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,9 @@ + ### edit one of these lines to '1', if you don't want the addon epgsearchonly, + ### conflictcheckonly or quickepgsearch + +-WITHOUT_EPGSEARCHONLY=0 +-WITHOUT_CONFLICTCHECKONLY=0 +-WITHOUT_QUICKSEARCH=0 ++WITHOUT_EPGSEARCHONLY=1 ++WITHOUT_CONFLICTCHECKONLY=1 ++WITHOUT_QUICKSEARCH=1 + + ### edit this to '0' if you don't want epgsearch to auto config itself + AUTOCONFIG=1 +-- +1.7.2.5 + diff --git a/packages/addons/multimedia/w_scan/addon b/packages/addons/multimedia/w_scan/addon deleted file mode 100755 index 7c5afeecc7..0000000000 --- a/packages/addons/multimedia/w_scan/addon +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin diff --git a/packages/addons/multimedia/w_scan/build b/packages/addons/multimedia/w_scan/build deleted file mode 100755 index 9dff05a192..0000000000 --- a/packages/addons/multimedia/w_scan/build +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - -make diff --git a/packages/addons/multimedia/w_scan/changelog.txt b/packages/addons/multimedia/w_scan/changelog.txt deleted file mode 100644 index 10fbd04f3a..0000000000 --- a/packages/addons/multimedia/w_scan/changelog.txt +++ /dev/null @@ -1,23 +0,0 @@ -4.0.1 -- rebuild - -4.0.0 -- rebuild for OpenELEC-4.0 - -3.1.1 -- rebuild for OpenELEC-3.2 - -3.0.2 -- update to w_scan-20121111 - -3.0.1 -- bump addon version - -2.1.2 -- update to w_scan-20120605 - -2.1.1 -- update to addon version 2.1 - -2.0.0 -- initial addon w_scan based on version 20120128 diff --git a/packages/addons/multimedia/w_scan/icon/icon.png b/packages/addons/multimedia/w_scan/icon/icon.png deleted file mode 100644 index ba5c9edd14..0000000000 Binary files a/packages/addons/multimedia/w_scan/icon/icon.png and /dev/null differ diff --git a/packages/addons/multimedia/w_scan/meta b/packages/addons/multimedia/w_scan/meta deleted file mode 100644 index 1e535a8362..0000000000 --- a/packages/addons/multimedia/w_scan/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="w_scan" -PKG_VERSION="20121111" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html" -PKG_URL="http://wirbel.htpc-forum.de/w_scan/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="lib/multimedia" -PKG_SHORTDESC="w_scan: eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf." -PKG_LONGDESC="w_scan ist eine kleine Anwendung zum Scannen von ATSC/DVB-C/S/T Transpondern/Bouquets nach Sendern und Erstellen einer VDR channels.conf." -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.python.script" -PKG_AUTORECONF="yes" diff --git a/packages/addons/multimedia/w_scan/patches/w_scan-20121111-kernel-3.7.patch b/packages/addons/multimedia/w_scan/patches/w_scan-20121111-kernel-3.7.patch deleted file mode 100644 index 7f130a5e7e..0000000000 --- a/packages/addons/multimedia/w_scan/patches/w_scan-20121111-kernel-3.7.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/scan.c b/scan.c -index c24e256..8f603f8 100644 ---- a/scan.c -+++ b/scan.c -@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd, struct transponder * t) { - case SCAN_TERRESTRIAL: - set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system); - if (t->param.u.terr.delivery_system == SYS_DVBT2) { -+#ifdef DTV_DVBT2_PLP_ID - set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id); -+#else -+ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id); -+#endif - } - set_cmd_sequence(DTV_FREQUENCY, t->param.frequency); - set_cmd_sequence(DTV_INVERSION, t->param.inversion); diff --git a/packages/addons/multimedia/w_scan/source/default.py b/packages/addons/multimedia/w_scan/source/default.py deleted file mode 100644 index 8d4c5e9e96..0000000000 --- a/packages/addons/multimedia/w_scan/source/default.py +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import os -import sys -import xbmcaddon diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 2d4c1fbb49..a1573a5950 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -8,7 +8,6 @@ - diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 1408ca1094..98d6f8a70f 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -116,6 +116,7 @@ if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then fi VDR_ARG="$VDR_ARG -P $PVR_PLUGIN" +VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol" if [ "$ENABLE_SOFTCAM" == "true" ] ; then VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN" @@ -129,9 +130,6 @@ fi if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then VDR_ARG="$VDR_ARG -P streamdev-client" fi -if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then - VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol" -fi if [ "$ENABLE_LIVE" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'" fi diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index 568f515bed..9b86038424 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -11,7 +11,6 @@ Enable plugin: iptv Enable plugin: streamdev-client Enable plugin: streamdev-server - Enable plugin: wirbelscan Enable softcam softcam plugin Enable plugin: live diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index a03e466466..824a6d11f9 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -22,7 +22,6 @@ - diff --git a/packages/linux/meta b/packages/linux/meta index 18dfa1a0aa..13c97deaef 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -21,7 +21,7 @@ PKG_NAME="linux" case "$LINUX" in *) - PKG_VERSION="3.12" + PKG_VERSION="3.12.1" ;; esac PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/linux/patches/3.12/linux-003-no_dev_console.patch b/packages/linux/patches/3.12.1/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.12/linux-003-no_dev_console.patch rename to packages/linux/patches/3.12.1/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.12/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.12.1/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.12/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.12.1/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.12/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.12.1/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.12/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.12.1/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.12.1/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.12/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.12.1/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.12/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.12.1/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.12/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.12.1/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.12.1/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.12/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.12.1/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.12.1/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.12/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.12.1/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.12.1/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.12/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.12.1/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.12.1/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch similarity index 100% rename from packages/linux/patches/3.12/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch rename to packages/linux/patches/3.12.1/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch diff --git a/packages/linux/patches/3.12/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.12.1/linux-058.06-hid_sony-add_SMK_link.patch similarity index 100% rename from packages/linux/patches/3.12/linux-058.06-hid_sony-add_SMK_link.patch rename to packages/linux/patches/3.12.1/linux-058.06-hid_sony-add_SMK_link.patch diff --git a/packages/linux/patches/3.12/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.12.1/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.12/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.12.1/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.12/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.12.1/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.12/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.12.1/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.12/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.12.1/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.12/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.12.1/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.12/linux-210-dvbsky.patch b/packages/linux/patches/3.12.1/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.12/linux-210-dvbsky.patch rename to packages/linux/patches/3.12.1/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.12/linux-210.01-dvbsky-auto-off.patch b/packages/linux/patches/3.12.1/linux-210.01-dvbsky-auto-off.patch similarity index 100% rename from packages/linux/patches/3.12/linux-210.01-dvbsky-auto-off.patch rename to packages/linux/patches/3.12.1/linux-210.01-dvbsky-auto-off.patch diff --git a/packages/linux/patches/3.12/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.12.1/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.12/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.12.1/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.12/linux-221-ngene-octopus.patch b/packages/linux/patches/3.12.1/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.12/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.12.1/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.12/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.12.1/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.12/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.12.1/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.12.1/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.12/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.12.1/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.12/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.12.1/linux-701-linksys_aes2500_brcmfmac.patch similarity index 100% rename from packages/linux/patches/3.12/linux-701-linksys_aes2500_brcmfmac.patch rename to packages/linux/patches/3.12.1/linux-701-linksys_aes2500_brcmfmac.patch diff --git a/packages/linux/patches/3.12/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch b/packages/linux/patches/3.12.1/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch similarity index 100% rename from packages/linux/patches/3.12/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch rename to packages/linux/patches/3.12.1/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch diff --git a/packages/linux/patches/3.12/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.12.1/linux-703-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.12/linux-703-macmini2012-ethernet.patch rename to packages/linux/patches/3.12.1/linux-703-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.12/linux-704-Support-for-Ubiquiti-WifiStation.patch b/packages/linux/patches/3.12.1/linux-704-Support-for-Ubiquiti-WifiStation.patch similarity index 100% rename from packages/linux/patches/3.12/linux-704-Support-for-Ubiquiti-WifiStation.patch rename to packages/linux/patches/3.12.1/linux-704-Support-for-Ubiquiti-WifiStation.patch diff --git a/packages/linux/patches/3.12/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch b/packages/linux/patches/3.12.1/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch similarity index 100% rename from packages/linux/patches/3.12/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch rename to packages/linux/patches/3.12.1/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch diff --git a/packages/linux/patches/3.12/linux-706-Sitecom-N300.patch b/packages/linux/patches/3.12.1/linux-706-Sitecom-N300.patch similarity index 100% rename from packages/linux/patches/3.12/linux-706-Sitecom-N300.patch rename to packages/linux/patches/3.12.1/linux-706-Sitecom-N300.patch diff --git a/packages/linux/patches/3.12/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.12.1/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.12/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.12.1/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.12/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.12.1/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.12/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.12.1/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.12.1/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch similarity index 100% rename from packages/linux/patches/3.12/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch rename to packages/linux/patches/3.12.1/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch diff --git a/packages/linux/patches/3.12/linux-990.11-ALSA-AMD-HD-Audio.patch b/packages/linux/patches/3.12.1/linux-990.11-ALSA-AMD-HD-Audio.patch similarity index 100% rename from packages/linux/patches/3.12/linux-990.11-ALSA-AMD-HD-Audio.patch rename to packages/linux/patches/3.12.1/linux-990.11-ALSA-AMD-HD-Audio.patch diff --git a/packages/linux/patches/3.12/linux-990.12-Radeon-SI-workaround.patch b/packages/linux/patches/3.12.1/linux-990.12-Radeon-SI-workaround.patch similarity index 100% rename from packages/linux/patches/3.12/linux-990.12-Radeon-SI-workaround.patch rename to packages/linux/patches/3.12.1/linux-990.12-Radeon-SI-workaround.patch diff --git a/packages/linux/patches/3.12/linux-990.13-Fix-clock-calculations-by-Pierre-Ossman.patch b/packages/linux/patches/3.12.1/linux-990.13-Fix-clock-calculations-by-Pierre-Ossman.patch similarity index 100% rename from packages/linux/patches/3.12/linux-990.13-Fix-clock-calculations-by-Pierre-Ossman.patch rename to packages/linux/patches/3.12.1/linux-990.13-Fix-clock-calculations-by-Pierre-Ossman.patch diff --git a/packages/linux/patches/3.12/linux-990.15-Fix-missing-multichannel-PCM-SAD-in-some-cases.patch b/packages/linux/patches/3.12.1/linux-990.15-Fix-missing-multichannel-PCM-SAD-in-some-cases.patch similarity index 100% rename from packages/linux/patches/3.12/linux-990.15-Fix-missing-multichannel-PCM-SAD-in-some-cases.patch rename to packages/linux/patches/3.12.1/linux-990.15-Fix-missing-multichannel-PCM-SAD-in-some-cases.patch diff --git a/packages/linux/patches/3.12/linux-991.01-ptrace_fix.patch b/packages/linux/patches/3.12.1/linux-991.01-ptrace_fix.patch similarity index 100% rename from packages/linux/patches/3.12/linux-991.01-ptrace_fix.patch rename to packages/linux/patches/3.12.1/linux-991.01-ptrace_fix.patch diff --git a/packages/linux/patches/3.12/linux-992.01.i915_pass_mode_to_write_eld.patch b/packages/linux/patches/3.12.1/linux-992.01.i915_pass_mode_to_write_eld.patch similarity index 100% rename from packages/linux/patches/3.12/linux-992.01.i915_pass_mode_to_write_eld.patch rename to packages/linux/patches/3.12.1/linux-992.01.i915_pass_mode_to_write_eld.patch diff --git a/packages/linux/patches/3.12/linux-992.02-i915_set_hdmi_audio_clock.patch b/packages/linux/patches/3.12.1/linux-992.02-i915_set_hdmi_audio_clock.patch similarity index 100% rename from packages/linux/patches/3.12/linux-992.02-i915_set_hdmi_audio_clock.patch rename to packages/linux/patches/3.12.1/linux-992.02-i915_set_hdmi_audio_clock.patch diff --git a/packages/linux/patches/3.12/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.12.1/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.12/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.12.1/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.12/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch b/packages/linux/patches/3.12.1/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch similarity index 100% rename from packages/linux/patches/3.12/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch rename to packages/linux/patches/3.12.1/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service index b36d040d00..2bfd79307b 100644 --- a/packages/mediacenter/xbmc/system.d/xbmc.service +++ b/packages/mediacenter/xbmc/system.d/xbmc.service @@ -10,6 +10,8 @@ Environment=HOME=/storage EnvironmentFile=-/run/openelec/xbmc.conf EnvironmentFile=-/run/openelec/debug/xbmc.conf ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG" +# keep KillMode=process unless there is no good reason to switch to cgroup +KillMode=process TimeoutStopSec=10 Restart=always RestartSec=2 diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf index 50e3fc8452..92623ce534 100644 --- a/packages/network/samba/config/smb.conf +++ b/packages/network/samba/config/smb.conf @@ -113,12 +113,12 @@ root preexec = mkdir -p /storage/pictures [Emulators] - path = /storage/emulators/mame/roms + path = /storage/emulators available = yes browsable = yes public = yes writable = yes - root preexec = mkdir -p /storage/emulators/mame/roms + root preexec = mkdir -p /storage/emulators [Configfiles] path = /storage/.config