Merge remote-tracking branch 'upstream/master' into openelec-systemd

Conflicts: projects/ARCTIC_MC/linux/linux.x86_64.conf projects/ATV/linux/linux.i386.conf projects/Fusion/linux/linux.i386.conf projects/Fusion/linux/linux.x86_64.conf projects/Generic/linux/linux.i386.conf projects/Generic/linux/linux.x86_64.conf projects/Generic_OSS/linux/linux.i386.conf projects/ION/linux/linux.x86_64.conf projects/Intel/linux/linux.x86_64.conf projects/Virtual/linux/linux.i386.conf projects/Virtual/linux/linux.x86_64.conf
2025-07-29 05:36:47 +00:00 · 2013-09-07 22:22:08 +03:00 · 2013-09-07 22:22:08 +03:00 · 9c6e9af0f1
commit 9c6e9af0f1
parent 1993e615de 11013c2bee
13 changed files with 3866 additions and 19 deletions
--- a/packages/mediacenter/service.openelec.settings/meta
+++ b/packages/mediacenter/service.openelec.settings/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.2.10"
+PKG_VERSION="0.2.11"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."
--- a/packages/network/connman/patches/connman-04-do-not-add-default-gw-as-timeserver.patch
+++ b/packages/network/connman/patches/connman-04-do-not-add-default-gw-as-timeserver.patch
@ -0,0 +1,49 @@
+From 0b595ee514797c75663a9ddc4ddc81c6c82dc64a Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 7 Sep 2013 15:11:36 +0300
+Subject: [PATCH] do not add default gw as timeserver
+
+*always* adding default gw to timeserver list is a horrible idea
+
+this reverts http://git.kernel.org/cgit/network/connman/connman.git/commit/?id=bbd19813c457227a2861c05e9ebc676f8feb7f10
+---
+ src/timeserver.c |   13 -------------
+ 1 files changed, 0 insertions(+), 13 deletions(-)
+
+diff --git a/src/timeserver.c b/src/timeserver.c
+index 6440611..6386521 100644
+--- a/src/timeserver.c
+++ b/src/timeserver.c
+@@ -179,11 +179,9 @@ GSList *__connman_timeserver_add_list(GSList *server_list,
+ GSList *__connman_timeserver_get_all(struct connman_service *service)
+ {
+ 	GSList *list = NULL;
+-	struct connman_network *network;
+ 	char **timeservers;
+ 	char **service_ts;
+ 	char **service_ts_config;
+-	const char *service_gw;
+ 	char **fallback_ts;
+ 	int index, i;
+ 
+@@ -204,17 +202,6 @@ GSList *__connman_timeserver_get_all(struct connman_service *service)
+ 	for (i = 0; service_ts && service_ts[i]; i++)
+ 		list = __connman_timeserver_add_list(list, service_ts[i]);
+ 
+-	network = __connman_service_get_network(service);
+-	if (network) {
+-		index = connman_network_get_index(network);
+-		service_gw = __connman_ipconfig_get_gateway_from_index(index,
+-			CONNMAN_IPCONFIG_TYPE_ALL);
+-
+-		/* Then add Service Gateway to the list */
+-		if (service_gw)
+-			list = __connman_timeserver_add_list(list, service_gw);
+-	}
+-
+ 	/* Then add Global Timeservers to the list */
+ 	timeservers = load_timeservers();
+ 
+-- 
+1.7.2.5
+
--- a/packages/tools/syslinux/files/create_livestick
+++ b/packages/tools/syslinux/files/create_livestick
@ -113,6 +113,21 @@ echo "#########################################################"
    exit 1
  fi

+  # this is needed to format the drive
+  which mkfs.vfat > /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 \"mkfs.vfat\"       #"
+    echo "#      on your system.                                  #"
+    echo "#      Please install it via your package manager.      #"
+    echo "#                                                       #"
+    echo "#########################################################"
+    exit 1
+  fi

 # check MD5 sums
  echo "checking MD5 sum..."
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@ -461,7 +461,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@ -448,8 +448,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@ -471,7 +471,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
@ -527,8 +531,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # x86 CPU frequency scaling drivers
 #
-# CONFIG_X86_INTEL_PSTATE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
 # CONFIG_X86_POWERNOW_K6 is not set
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@ -461,7 +461,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
@ -517,8 +521,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # x86 CPU frequency scaling drivers
 #
-# CONFIG_X86_INTEL_PSTATE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_POWERNOW_K8=y
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@ -471,7 +471,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
@ -527,8 +531,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # x86 CPU frequency scaling drivers
 #
-# CONFIG_X86_INTEL_PSTATE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
 # CONFIG_X86_POWERNOW_K6 is not set
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@ -440,7 +440,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@ -453,7 +453,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
@ -509,8 +513,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # x86 CPU frequency scaling drivers
 #
-# CONFIG_X86_INTEL_PSTATE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_POWERNOW_K8 is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@ -471,7 +471,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@ -461,7 +461,11 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y