config/version: set version to 3.2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>

CHANGELOG

@@ -1,20 +1,3 @@
-OpenELEC (Version 2.1)
+for a changelog see:
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
-
-Added packages:
-  - add package 'ppp'
-  - add package 'pptp'
-
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
-
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
-
-Changed functions:
-
-Removed functions:
+https://github.com/OpenELEC/OpenELEC.tv/commits/openelec-3.2

config/graphic

@@ -95,18 +95,21 @@ get_graphicdrivers() {
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="3.2.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="3.2"

packages/devel/llvm/package.mk

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.0"
+PKG_VERSION="3.3.src"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://llvm.org/releases/3.3/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS_TARGET="toolchain llvm:host"
 PKG_BUILD_DEPENDS_HOST="toolchain"
@@ -37,24 +37,11 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_HOST="--enable-polly \
-                         --enable-optimized \
-                         --disable-profiling \
+PKG_CONFIGURE_OPTS_HOST="--disable-polly \
                          --disable-assertions \
-                         --disable-expensive-checks \
+                         --enable-optimized \
                          --disable-debug-runtime \
-                         --disable-debug-symbols \
-                         --enable-jit \
-                         --disable-docs \
-                         --disable-doxygen \
-                         --enable-threads \
-                         --enable-pthreads \
-                         --enable-pic \
-                         --enable-shared \
-                         --enable-embed-stdcxx \
-                         --enable-timestamps \
-                         --disable-libffi \
-                         --enable-ltdl-install"
+                         --disable-debug-symbols"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
                            --enable-optimized \
@@ -76,28 +63,42 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
                            --disable-ltdl-install"
 
 if [ "$TARGET_ARCH" = i386 ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86"
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86"
 elif [ "$TARGET_ARCH" = x86_64 ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86_64"
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64"
+elif [ "$TARGET_ARCH" = arm ]; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=arm"
 fi
 
-PKG_MAKE_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen"
-PKG_MAKEINSTALL_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen"
+PKG_MAKE_OPTS_HOST="BUILD_DIRS_ONLY=1 CFLAGS= CXXFLAGS="
 
 pre_configure_host() {
   ( cd ../autoconf
     aclocal  --force --verbose -I m4
     autoconf --force --verbose -I m4 -o ../configure
   )
+
+  ( cd ../projects/sample/autoconf
+    aclocal  --force --verbose -I m4
+    autoconf --force --verbose -I m4 -o ../configure
+  )
+
+  # we are building hosttools inside the target builddir
+    mkdir -p ../.$TARGET_NAME && cd ../.$TARGET_NAME/
+    rm -rf ../.$HOST_NAME
+    mkdir -p BuildTools && cd BuildTools
 }
 
 pre_configure_target() {
-  # llvm fails to build with LTO support
+# llvm fails to build with LTO support
     strip_lto
 }
 
+makeinstall_host() {
+# nothing to install here
+ :
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/BugpointPasses.so

packages/devel/llvm/patches/llvm-3.0-cross.patch

@@ -1,109 +0,0 @@
-diff -Naur llvm-3.0.src/autoconf/configure.ac llvm-3.0.src.patch/autoconf/configure.ac
---- llvm-3.0.src/autoconf/configure.ac	2011-10-16 04:52:56.000000000 +0200
-+++ llvm-3.0.src.patch/autoconf/configure.ac	2011-12-03 12:57:33.324415172 +0100
-@@ -393,6 +393,10 @@
-        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
-      fi
-   fi
-+  AC_SUBST(BUILD_CPPFLAGS)
-+  AC_SUBST(BUILD_CFLAGS)
-+  AC_SUBST(BUILD_CXXFLAGS)
-+  AC_SUBST(BUILD_LDFLAGS)
- else
-   AC_SUBST(LLVM_CROSS_COMPILING, [0])
- fi
-diff -Naur llvm-3.0.src/autoconf/m4/build_exeext.m4 llvm-3.0.src.patch/autoconf/m4/build_exeext.m4
---- llvm-3.0.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
-+++ llvm-3.0.src.patch/autoconf/m4/build_exeext.m4	2011-12-03 12:57:33.327415229 +0100
-@@ -18,7 +18,7 @@
-      fi
-   fi
-   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
--  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-+  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_build_exeext=
-diff -Naur llvm-3.0.src/Makefile llvm-3.0.src.patch/Makefile
---- llvm-3.0.src/Makefile	2011-10-08 02:27:38.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile	2011-12-03 13:00:42.692055438 +0100
-@@ -104,38 +104,6 @@
-   DIRS := $(filter-out unittests, $(DIRS))
- endif
- 
--# If we're cross-compiling, build the build-hosted tools first
--ifeq ($(LLVM_CROSS_COMPILING),1)
--all:: cross-compile-build-tools
--
--clean::
--	$(Verb) rm -rf BuildTools
--
--cross-compile-build-tools:
--	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
--          $(MKDIR) BuildTools; \
--	  cd BuildTools ; \
--	  unset CFLAGS ; \
--	  unset CXXFLAGS ; \
--	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
--	        --disable-polly ; \
--	  cd .. ; \
--	fi; \
--	(unset SDKROOT; \
--	 $(MAKE) -C BuildTools \
--	  BUILD_DIRS_ONLY=1 \
--	  UNIVERSAL= \
--	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
--	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
--	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
--	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
--	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
--	  CFLAGS= \
--	  CXXFLAGS= \
--	) || exit 1;
--endif
--
- # Include the main makefile machinery.
- include $(LLVM_SRC_ROOT)/Makefile.rules
- 
-diff -Naur llvm-3.0.src/Makefile.config.in llvm-3.0.src.patch/Makefile.config.in
---- llvm-3.0.src/Makefile.config.in	2011-10-13 19:27:34.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile.config.in	2011-12-03 12:57:33.962427436 +0100
-@@ -113,6 +113,10 @@
- # call if we're cross-compiling).
- BUILD_CC=@BUILD_CC@
- BUILD_CXX=@BUILD_CXX@
-+BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
-+BUILD_CFLAGS=@BUILD_CFLAGS@
-+BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
-+BUILD_LDFLAGS=@BUILD_LDFLAGS@
- 
- # Triple for configuring build tools when cross-compiling
- BUILD_TRIPLE=@build@
-diff -Naur llvm-3.0.src/Makefile.rules llvm-3.0.src.patch/Makefile.rules
---- llvm-3.0.src/Makefile.rules	2011-10-11 14:51:44.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile.rules	2011-12-03 12:59:37.459801461 +0100
-@@ -641,18 +641,18 @@
- 
- ifeq ($(BUILD_COMPONENT), 1)
-   Compile.C     = $(Compile.Wrapper) \
--	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
-+	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) -c
-   Compile.CXX   = $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
- 		  $(CPPFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) -c
-   Preprocess.CXX= $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \
-                   $(CompileCommonOpts) $(CXX.Flags) -E
-   Link          = $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
--		  $(LD.Flags) $(LDFLAGS) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
-+		  $(LD.Flags) $(BUILD_LDFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
- else
-   Compile.C     = $(Compile.Wrapper) \

packages/devel/llvm/patches/llvm-3.3-cross.patch

@@ -0,0 +1,114 @@
+diff -Naur llvm-3.3.src/autoconf/configure.ac llvm-3.3.src.patch/autoconf/configure.ac
+--- llvm-3.3.src/autoconf/configure.ac	2013-05-20 22:18:23.000000000 +0200
++++ llvm-3.3.src.patch/autoconf/configure.ac	2013-09-24 07:20:25.485443916 +0200
+@@ -461,6 +461,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-3.3.src/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/autoconf/m4/build_exeext.m4
+--- llvm-3.3.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
++++ llvm-3.3.src.patch/autoconf/m4/build_exeext.m4	2013-09-24 07:20:25.485443916 +0200
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=
+diff -Naur llvm-3.3.src/Makefile llvm-3.3.src.patch/Makefile
+--- llvm-3.3.src/Makefile	2013-01-28 04:19:57.000000000 +0100
++++ llvm-3.3.src.patch/Makefile	2013-09-24 07:21:27.489493235 +0200
+@@ -99,44 +99,6 @@
+   DIRS := $(filter-out unittests, $(DIRS))
+ endif
+ 
+-# If we're cross-compiling, build the build-hosted tools first
+-ifeq ($(LLVM_CROSS_COMPILING),1)
+-all:: cross-compile-build-tools
+-
+-clean::
+-	$(Verb) rm -rf BuildTools
+-
+-cross-compile-build-tools:
+-	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
+-          $(MKDIR) BuildTools; \
+-	  cd BuildTools ; \
+-	  unset CFLAGS ; \
+-	  unset CXXFLAGS ; \
+-	  unset SDKROOT ; \
+-	  unset UNIVERSAL_SDK_PATH ; \
+-	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
+-		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
+-	        --disable-polly ; \
+-	  cd .. ; \
+-	fi; \
+-	($(MAKE) -C BuildTools \
+-	  BUILD_DIRS_ONLY=1 \
+-	  UNIVERSAL= \
+-	  UNIVERSAL_SDK_PATH= \
+-	  SDKROOT= \
+-	  TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
+-	  TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
+-	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
+-	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
+-	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
+-	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
+-	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+-	  ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
+-	  CFLAGS= \
+-	  CXXFLAGS= \
+-	) || exit 1;
+-endif
+-
+ # Include the main makefile machinery.
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 
+diff -Naur llvm-3.3.src/Makefile.config.in llvm-3.3.src.patch/Makefile.config.in
+--- llvm-3.3.src/Makefile.config.in	2013-04-23 10:28:39.000000000 +0200
++++ llvm-3.3.src.patch/Makefile.config.in	2013-09-24 07:20:25.487443917 +0200
+@@ -130,6 +130,10 @@
+ # call if we're cross-compiling).
+ BUILD_CC=@BUILD_CC@
+ BUILD_CXX=@BUILD_CXX@
++BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
++BUILD_CFLAGS=@BUILD_CFLAGS@
++BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ 
+ # Triple for configuring build tools when cross-compiling
+ BUILD_TRIPLE=@build@
+diff -Naur llvm-3.3.src/projects/sample/autoconf/configure.ac llvm-3.3.src.patch/projects/sample/autoconf/configure.ac
+--- llvm-3.3.src/projects/sample/autoconf/configure.ac	2013-05-06 18:23:07.000000000 +0200
++++ llvm-3.3.src.patch/projects/sample/autoconf/configure.ac	2013-09-24 07:33:47.746272015 +0200
+@@ -345,6 +345,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4
+--- llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4	2011-10-19 01:10:47.000000000 +0200
++++ llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4	2013-09-24 07:32:18.332178706 +0200
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=

packages/devel/llvm/rename

@@ -1,25 +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 $1
-
-mv $BUILD/$PKG_NAME-$PKG_VERSION.src $BUILD/$PKG_NAME-$PKG_VERSION

packages/graphics/Mesa/package.mk

@@ -41,7 +41,7 @@ PKG_AUTORECONF="yes"
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET llvm"
   PKG_DEPENDS="$PKG_DEPENDS llvm"
-  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config-host"
   MESA_GALLIUM_LLVM="--enable-gallium-llvm --with-llvm-shared-libs"
 else
   MESA_GALLIUM_LLVM="--disable-gallium-llvm"

packages/graphics/bcm2835-driver/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="7d8a762"
+PKG_VERSION="86e7643"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux-firmware/wlan-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.13"
+PKG_VERSION="0.0.14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/init.d/02_cpupower

@@ -28,16 +28,17 @@ progress "set cpu's to full power"
     printf "performance" > $i
   done 2>/dev/null
 
-progress "set onedemand threshold"
-  if [ -f /sys/devices/system/cpu/cpufreq/ondemand/up_threshold ]; then
-    echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
-  fi
-
 (
   usleep 40000000
   progress "set cpu's to 'ondemand'"
   for i in /sys/devices/system/cpu/*/cpufreq/scaling_governor; do
     printf "ondemand" > $i
   done 2>/dev/null
+
+  progress "set onedemand threshold"
+  if [ -f /sys/devices/system/cpu/cpufreq/ondemand/up_threshold ]; then
+    echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
+  fi
+
 )&
 

packages/linux/meta

@@ -34,7 +34,7 @@ case "$LINUX" in
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
     ;;
   *)
-    PKG_VERSION="3.10.11"
+    PKG_VERSION="3.10.13"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac

packages/linux/patches/3.10.11/linux-990.07-ALSA-hda-hdmi-Fallback-to-ALSA-allocation-when-selec.patch

@@ -1,70 +0,0 @@
-From d0929f7068e8025a3d9ccf5dd7bea8dc0d887a49 Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi.hannula@iki.fi>
-Date: Sun, 1 Sep 2013 13:01:09 +0300
-Subject: [PATCH] ALSA: hda - hdmi: Fallback to ALSA allocation when selecting
- CA
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-hdmi_channel_allocation() tries to find a HDMI channel allocation that
-matches the number channels in the playback stream and contains only
-speakers that the HDMI sink has reported as available via EDID. If no
-such allocation is found, 0 (stereo audio) is used.
-
-Using CA 0 causes the audio causes the sink to discard everything except
-the first two channels (front left and front right).
-
-However, the sink may be capable of receiving more channels than it has
-speakers (and then perform downmix or discard the extra channels), in
-which case it is preferable to use a CA that contains extra channels
-than to use CA 0 which discards all the non-stereo channels.
-
-Additionally, it seems that HBR passthrough output does not work on
-Intel HDMI codecs when CA is set to 0 (possibly the codec zeroes
-channels not present in CA). This happens with all receivers that report
-a 5.1 speaker mask since a HBR stream is carried on 8 channels to the
-codec.
-
-Add a fallback in the CA selection so that the CA channel count at least
-matches the stream channel count, even if the streams contains channels
-not present in the sink speaker descriptor.
-
-Thanks to GrimGriefer at OpenELEC forums for discovering that changing
-the sink speaker mask allowed HBR output.
-
-Reported-by: GrimGriefer
-Reported-by: Ashecrow
-Reported-by: Frank Zafka <kafkaesque1978@gmail.com>
-Reported-by: Peter Frühberger <fritsch@xbmc.org>
-Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
-Cc: <stable@vger.kernel.org>
----
- sound/pci/hda/patch_hdmi.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 030ca86..354fc55 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -551,6 +551,17 @@ static int hdmi_channel_allocation(struct hdmi_eld *eld, int channels)
- 		}
- 	}
- 
-+	if (!ca) {
-+		/* if there was no match, select the regular ALSA channel
-+		 * allocation with the matching number of channels */
-+		for (i = 0; i < ARRAY_SIZE(channel_allocations); i++) {
-+			if (channels == channel_allocations[i].channels) {
-+				ca = channel_allocations[i].ca_index;
-+				break;
-+			}
-+		}
-+	}
-+
- 	snd_print_channel_allocation(eld->info.spk_alloc, buf, sizeof(buf));
- 	snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",
- 		    ca, channels, buf);
--- 
-1.8.1.5
-

packages/linux/patches/3.10.11/linux-999.01-smsdvb-fix-kernel-panic-on-inserting-DVB-T-stick.patch

@@ -1,94 +0,0 @@
-From d78a0599d5b5d4da384eae08bf7da316389dfbe5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
-Date: Wed, 14 Aug 2013 10:24:39 +0200
-Subject: [PATCH] [media] siano: fix divide error on 0 counters
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ts_packets and ets_packets counters can be 0.  Don't fall over
-if they are. Fixes:
-
-[  846.851711] divide error: 0000 [#1] SMP
-[  846.851806] Modules linked in: smsdvb dvb_core ir_lirc_codec lirc_dev ir_sanyo_decoder ir_mce_kbd_decoder ir_sony_decoder ir_jvc_decoder ir_rc6_decoder ir_rc5_decoder ir_nec_decoder rc_hauppauge smsusb smsmdtv rc_core pci_stub vboxpci(O) vboxnetadp(O) vboxnetflt(O) vboxdrv(O) parport_pc ppdev lp parport cpufreq_userspace cpufreq_powersave cpufreq_stats cpufreq_conservative rfcomm bnep binfmt_misc uinput nfsd auth_rpcgss oid_registry nfs_acl nfs lockd dns_resolver fscache sunrpc ext4 jbd2 fuse tp_smapi(O) thinkpad_ec(O) loop firewire_sbp2 dm_crypt snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm thinkpad_acpi nvram snd_page_alloc hid_generic snd_seq_midi snd_seq_midi_event arc4 usbhid snd_rawmidi uvcvideo hid iwldvm coretemp kvm_intel mac8021
- 1 cdc_wdm
-[  846.853477]  cdc_acm snd_seq videobuf2_vmalloc videobuf2_memops videobuf2_core videodev media kvm radeon r852 ttm joydev cdc_ether usbnet pcmcia mii sm_common nand btusb drm_kms_helper tpm_tis acpi_cpufreq bluetooth iwlwifi nand_ecc drm nand_ids i2c_i801 mtd snd_seq_device iTCO_wdt iTCO_vendor_support r592 memstick lpc_ich mperf tpm yenta_socket pcmcia_rsrc pcmcia_core cfg80211 snd_timer snd pcspkr i2c_algo_bit crc16 i2c_core tpm_bios processor mfd_core wmi psmouse mei_me rfkill mei serio_raw soundcore evdev battery button video ac microcode ext3 mbcache jbd md_mod dm_mirror dm_region_hash dm_log dm_mod sg sr_mod sd_mod cdrom crc_t10dif firewire_ohci sdhci_pci sdhci mmc_core firewire_core crc_itu_t thermal thermal_sys ahci libahci ehci_pci uhci_hcd ehci_hcd libata scsi_mod usbcore e1000
- e usb_common
-[  846.855310]  ptp pps_core
-[  846.855356] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G           O 3.10-2-amd64 #1 Debian 3.10.5-1
-[  846.855490] Hardware name: LENOVO 4061WFA/4061WFA, BIOS 6FET92WW (3.22 ) 12/14/2011
-[  846.855609] task: ffffffff81613400 ti: ffffffff81600000 task.ti: ffffffff81600000
-[  846.855636] RIP: 0010:[<ffffffffa092be0c>]  [<ffffffffa092be0c>] smsdvb_onresponse+0x264/0xa86 [smsdvb]
-[  846.863906] RSP: 0018:ffff88013bc03cf0  EFLAGS: 00010046
-[  846.863906] RAX: 0000000000000000 RBX: ffff880133bf6000 RCX: 0000000000000000
-[  846.863906] RDX: 0000000000000000 RSI: ffff88005d3b58c0 RDI: ffff880133bf6000
-[  846.863906] RBP: ffff88005d1da000 R08: 0000000000000058 R09: 0000000000000015
-[  846.863906] R10: 0000000000001a0d R11: 000000000000021a R12: ffff88005d3b58c0
-[  846.863906] R13: ffff88005d1da008 R14: 00000000ffffff8d R15: ffff880036cf5060
-[  846.863906] FS:  0000000000000000(0000) GS:ffff88013bc00000(0000) knlGS:0000000000000000
-[  846.863906] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
-[  846.863906] CR2: 00007f3a4b69ae50 CR3: 0000000036dac000 CR4: 00000000000407f0
-[  846.863906] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
-[  846.863906] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
-[  846.863906] Stack:
-[  846.863906]  ffff88007a102000 ffff88005d1da000 ffff88005d3b58c0 0000000000085824
-[  846.863906]  ffffffffa08c5aa3 ffff88005d1da000 ffff8800a6907390 ffff8800a69073b0
-[  846.863906]  ffff8800a6907000 ffffffffa08b642c 000000000000021a ffff8800a69073b0
-[  846.863906] Call Trace:
-[  846.863906]  <IRQ>
-[  846.863906]
-[  846.863906]  [<ffffffffa08c5aa3>] ? smscore_onresponse+0x1d5/0x353 [smsmdtv]
-[  846.863906]  [<ffffffffa08b642c>] ? smsusb_onresponse+0x146/0x192 [smsusb]
-[  846.863906]  [<ffffffffa004cb1a>] ? usb_hcd_giveback_urb+0x6c/0xac [usbcore]
-[  846.863906]  [<ffffffffa0217be1>] ? ehci_urb_done+0x62/0x72 [ehci_hcd]
-[  846.863906]  [<ffffffffa0217c82>] ? qh_completions+0x91/0x364 [ehci_hcd]
-[  846.863906]  [<ffffffffa0219bba>] ? ehci_work+0x8a/0x68e [ehci_hcd]
-[  846.863906]  [<ffffffff8107336c>] ? timekeeping_get_ns.constprop.10+0xd/0x31
-[  846.863906]  [<ffffffff81064d41>] ? update_cfs_rq_blocked_load+0xde/0xec
-[  846.863906]  [<ffffffff81058ec2>] ? run_posix_cpu_timers+0x25/0x575
-[  846.863906]  [<ffffffffa021aa46>] ? ehci_irq+0x211/0x23d [ehci_hcd]
-[  846.863906]  [<ffffffffa004c0c1>] ? usb_hcd_irq+0x31/0x48 [usbcore]
-[  846.863906]  [<ffffffff810996fd>] ? handle_irq_event_percpu+0x49/0x1a4
-[  846.863906]  [<ffffffff8109988a>] ? handle_irq_event+0x32/0x4b
-[  846.863906]  [<ffffffff8109bd76>] ? handle_fasteoi_irq+0x80/0xb6
-[  846.863906]  [<ffffffff8100e93e>] ? handle_irq+0x18/0x20
-[  846.863906]  [<ffffffff8100e657>] ? do_IRQ+0x40/0x95
-[  846.863906]  [<ffffffff813883ed>] ? common_interrupt+0x6d/0x6d
-[  846.863906]  <EOI>
-[  846.863906]
-[  846.863906]  [<ffffffff812a011c>] ? arch_local_irq_enable+0x4/0x8
-[  846.863906]  [<ffffffff812a04f3>] ? cpuidle_enter_state+0x52/0xc1
-[  846.863906]  [<ffffffff812a0636>] ? cpuidle_idle_call+0xd4/0x143
-[  846.863906]  [<ffffffff8101398c>] ? arch_cpu_idle+0x5/0x17
-[  846.863906]  [<ffffffff81072571>] ? cpu_startup_entry+0x10d/0x187
-[  846.863906]  [<ffffffff816b3d3d>] ? start_kernel+0x3e8/0x3f3
-[  846.863906]  [<ffffffff816b3777>] ? repair_env_string+0x54/0x54
-[  846.863906]  [<ffffffff816b3598>] ? x86_64_start_kernel+0xf2/0xfd
-[  846.863906] Code: 25 09 00 00 c6 83 da 08 00 00 03 8b 45 54 48 01 83 b6 08 00 00 8b 45 50 48 01 83 db 08 00 00 8b 4d 18 69 c1 ff ff 00 00 03 4d 14 <48> f7 f1 89 83 a8 09 00 00 e9 68 fe ff ff 48 8b 7f 10 e8 79 92
-[  846.863906] RIP  [<ffffffffa092be0c>] smsdvb_onresponse+0x264/0xa86 [smsdvb]
-[  846.863906]  RSP <ffff88013bc03cf0>
-
-Reported-by: Johannes Rohr <jorohr@gmail.com>
-Reference: http://bugs.debian.org/719623
-Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
-Signed-off-by: Bj?rn Mork <bjorn@mork.no>
----
- drivers/media/common/siano/smsdvb-main.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
-index 0862622..63676a8 100644
---- a/drivers/media/common/siano/smsdvb-main.c
-+++ b/drivers/media/common/siano/smsdvb-main.c
-@@ -276,7 +276,8 @@  static void smsdvb_update_per_slices(struct smsdvb_client_t *client,
- 
- 	/* Legacy PER/BER */
- 	tmp = p->ets_packets * 65535;
--	do_div(tmp, p->ts_packets + p->ets_packets);
-+	if (p->ts_packets + p->ets_packets)
-+		do_div(tmp, p->ts_packets + p->ets_packets);
- 	client->legacy_per = tmp;
- }
- 
--- 
-1.7.10.4

packages/linux/patches/3.10.13/linux-704-Support-for-Ubiquiti-WifiStation.patch

@@ -0,0 +1,28 @@
+From 62330f8f9b6105bfe201f52b7ed86ea6ce3d5901 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 8 Sep 2013 10:33:51 +0100
+Subject: [PATCH] Add Ubiquiti WifiStation USB id to ath9k wifi driver
+
+---
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
+index 75a6376..8cb8d8d 100644
+--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
+@@ -37,9 +37,11 @@
+ 	{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
+ 	{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
+ 	{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
++	{ USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
+ 	{ USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
+ 	{ USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
+ 	{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
++	{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
+ 
+ 	{ USB_DEVICE(0x0cf3, 0x7015),
+ 	  .driver_info = AR9287_USB },  /* Atheros */
+-- 
+1.8.4
+

packages/linux/patches/3.10.13/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch

@@ -0,0 +1,30 @@
+From edab54fcfb1eb4b56868d2e364cf49dc3c6bad25 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 18 Sep 2013 14:52:05 +0300
+Subject: [PATCH] A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
+ Change the TEVII_S471 according the changes to TEVII_S470.
+
+BP: https://linuxtv.org/patch/19731/
+---
+ drivers/media/pci/cx23885/cx23885-dvb.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
+index 5db14f8..4cbf20a 100644
+--- a/drivers/media/pci/cx23885/cx23885-dvb.c
++++ b/drivers/media/pci/cx23885/cx23885-dvb.c
+@@ -1339,6 +1339,11 @@ static int dvb_register(struct cx23885_tsport *port)
+ 		fe0->dvb.frontend = dvb_attach(ds3000_attach,
+ 					&tevii_ds3000_config,
+ 					&i2c_bus->i2c_adap);
++		if (fe0->dvb.frontend != NULL) {
++			dvb_attach(ts2020_attach, fe0->dvb.frontend,
++				&tevii_ts2020_config, &i2c_bus->i2c_adap);
++			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
++		}
+ 		break;
+ 	case CX23885_BOARD_BST_PS8512:
+ 	case CX23885_BOARD_DVBSKY_S950:
+-- 
+1.7.2.5
+

packages/linux/patches/3.10.13/linux-999.03-mac80211-ignore-ECSA-in-probe-response-frames.patch

@@ -0,0 +1,49 @@
+From 9098cb577d0f4b2dd71f37988515686008b7c733 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Tue, 24 Sep 2013 13:42:50 +0300
+Subject: [PATCH] mac80211: ignore (E)CSA in probe response frames
+
+BP: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/net/mac80211/mlme.c?id=d70b7616d9080ec9f868fbd31db5fd4341435d61
+
+thanks @bedouin67
+---
+ net/mac80211/mlme.c | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
+index 5b4328d..1c5a8e6 100644
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -2885,19 +2885,11 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
+ 	if (bss)
+ 		ieee80211_rx_bss_put(local, bss);
+ 
+-	if (!sdata->u.mgd.associated ||
+-	    !ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid))
+-		return;
+-
+ 	if (need_ps) {
+ 		mutex_lock(&local->iflist_mtx);
+ 		ieee80211_recalc_ps(local, -1);
+ 		mutex_unlock(&local->iflist_mtx);
+ 	}
+-
+-	ieee80211_sta_process_chanswitch(sdata, rx_status->mactime,
+-					 elems, true);
+-
+ }
+ 
+ 
+@@ -3182,6 +3174,9 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
+ 
+ 	ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
+ 
++	ieee80211_sta_process_chanswitch(sdata, rx_status->mactime,
++			&elems, true);
++
+ 	if (ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
+ 				     elems.wmm_param_len))
+ 		changed |= BSS_CHANGED_QOS;
+-- 
+1.8.3.2
+

packages/mediacenter/service.openelec.settings/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.2.13"
+PKG_VERSION="0.2.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.2-68a881d"
+PKG_VERSION="12.2-cd71444"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-2ef8929"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.2-68a881d"
+PKG_VERSION="12.2-cd71444"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-2ef8929"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/patches/12.2-68a881d/xbmc-990.24-wait-for-nic-on-wakeup.patch

@@ -1,60 +0,0 @@
-diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
-index 26d7002..71c4bd4 100644
---- a/xbmc/powermanagement/PowerManager.cpp
-+++ b/xbmc/powermanagement/PowerManager.cpp
-@@ -23,6 +23,7 @@
- #include "Application.h"
- #include "cores/AudioEngine/AEFactory.h"
- #include "input/KeyboardStat.h"
-+#include "network/Network.h"
- #include "settings/GUISettings.h"
- #include "windowing/WindowingFactory.h"
- #include "utils/log.h"
-@@ -218,10 +219,34 @@ void CPowerManager::OnSleep()
-   CAEFactory::Suspend();
- }
- 
-+void CPowerManager::WaitForNet()
-+{
-+  CLog::Log(LOGDEBUG, "%s: Waithing for first NIC to come up", __FUNCTION__);
-+
-+  const unsigned maxLoopCount = 50u;
-+  const unsigned sleepTimeMs = 200u;
-+
-+  for(unsigned i=0; i < 50; ++i)
-+  {
-+    CNetworkInterface* pIface = g_application.getNetwork().GetFirstConnectedInterface();
-+    if (pIface && pIface->IsEnabled() && pIface->IsConnected())
-+    {
-+      CLog::Log(LOGDEBUG, "%s: NIC is up after waiting %d ms", __FUNCTION__, i * sleepTimeMs);
-+      return;
-+    }
-+
-+    Sleep(sleepTimeMs);
-+  }
-+
-+  CLog::Log(LOGDEBUG, "%s: NIC did not come up within %d ms... Lets give up...", __FUNCTION__, maxLoopCount * sleepTimeMs);
-+}
-+
- void CPowerManager::OnWake()
- {
-   CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__);
- 
-+  WaitForNet();
-+
-   // reset out timers
-   g_application.ResetShutdownTimers();
- 
-diff --git a/xbmc/powermanagement/PowerManager.h b/xbmc/powermanagement/PowerManager.h
-index 0a9183c..714b5cc 100644
---- a/xbmc/powermanagement/PowerManager.h
-+++ b/xbmc/powermanagement/PowerManager.h
-@@ -72,6 +72,8 @@ private:
- 
-   void OnLowBattery();
- 
-+  void WaitForNet();
-+
-   IPowerSyscall *m_instance;
- };
- 

packages/mediacenter/xbmc/patches/12.2-cd71444/xbmc-990.30-After-suspend-wait-for-the-first-NIC-to-come-up.patch

@@ -0,0 +1,74 @@
+From 7cd450bb2b8ea18277efff955202bf3b36573898 Mon Sep 17 00:00:00 2001
+From: verybadsoldier <vbs@springrts.de>
+Date: Sun, 1 Sep 2013 17:10:19 +0200
+Subject: [PATCH] After suspend wait for the first NIC to come up before
+ continuing
+
+---
+ xbmc/powermanagement/PowerManager.cpp | 24 ++++++++++++++++++++++++
+ xbmc/powermanagement/PowerManager.h   |  2 ++
+ 2 files changed, 26 insertions(+)
+
+diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
+index a68910b..8e93492 100644
+--- a/xbmc/powermanagement/PowerManager.cpp
++++ b/xbmc/powermanagement/PowerManager.cpp
+@@ -23,6 +23,7 @@
+ #include "Application.h"
+ #include "cores/AudioEngine/AEFactory.h"
+ #include "input/KeyboardStat.h"
++#include "network/Network.h"
+ #include "settings/GUISettings.h"
+ #include "windowing/WindowingFactory.h"
+ #include "utils/log.h"
+@@ -207,6 +207,8 @@ void CPowerManager::OnWake()
+ {
+   CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__);
+ 
++  WaitForNic();
++
+   // reset out timers
+   g_application.ResetShutdownTimers();
+ 
+@@ -254,3 +256,25 @@ void CPowerManager::OnLowBattery()
+ 
+   CAnnouncementManager::Announce(System, "xbmc", "OnLowBattery");
+ }
++
++void CPowerManager::WaitForNic()
++{
++    CLog::Log(LOGDEBUG, "%s: Waithing for first NIC to come up", __FUNCTION__);
++
++    const unsigned maxLoopCount = 50u;
++    const unsigned sleepTimeMs = 200u;
++
++    for(unsigned i=0; i < maxLoopCount; ++i)
++    {
++        CNetworkInterface* pIface = g_application.getNetwork().GetFirstConnectedInterface();
++        if (pIface && pIface->IsEnabled() && pIface->IsConnected())
++        {
++            CLog::Log(LOGDEBUG, "%s: NIC is up after waiting %d ms", __FUNCTION__, i * sleepTimeMs);
++            return;
++        }
++
++        Sleep(sleepTimeMs);
++    }
++
++    CLog::Log(LOGDEBUG, "%s: NIC did not come up within %d ms... Lets give up...", __FUNCTION__, maxLoopCount * sleepTimeMs);
++}
+diff --git a/xbmc/powermanagement/PowerManager.h b/xbmc/powermanagement/PowerManager.h
+index deb4b66..476cdc1 100644
+--- a/xbmc/powermanagement/PowerManager.h
++++ b/xbmc/powermanagement/PowerManager.h
+@@ -73,6 +73,8 @@ class CPowerManager : public IPowerEventsCallback
+ 
+   void OnLowBattery();
+ 
++  void WaitForNic();
++
+   IPowerSyscall *m_instance;
+ };
+ 
+-- 
+1.8.4
+

packages/multimedia/libaacs/build

@@ -1,40 +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 $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-static \
-            --enable-shared \
-            --disable-werror \
-            --disable-extra-warnings \
-            --disable-optimizations \
-            --disable-examples \
-            --disable-debug \
-            --with-gnu-ld
-
-make
-
-$MAKEINSTALL

packages/multimedia/libaacs/install

@@ -1,29 +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 $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/config/aacs
-  cp -P $PKG_BUILD/KEYDB.cfg $INSTALL/usr/config/aacs

packages/multimedia/libaacs/package.mk

@@ -19,18 +19,36 @@
 ################################################################################
 
 PKG_NAME="libaacs"
-PKG_VERSION="0.5.0"
+PKG_VERSION="0.6.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/libaacs.html"
 PKG_URL="ftp://ftp.videolan.org/pub/videolan/libaacs/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libgcrypt"
-PKG_BUILD_DEPENDS="toolchain libgcrypt"
+PKG_BUILD_DEPENDS_TARGET="toolchain libgcrypt"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="libaacs: a research project to implement the Advanced Access Content System specification."
 PKG_LONGDESC="libaacs is a research project to implement the Advanced Access Content System specification. This research project provides, through an open-source library, a way to understand how the AACS works. This research project is mainly developed by an international team of developers from Doom9."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
+                           --disable-extra-warnings \
+                           --disable-optimizations \
+                           --disable-examples \
+                           --disable-debug \
+                           --with-gnu-ld"
+
+pre_configure_target() {
+# libaacs fails to build in subdirs
+  cd $ROOT/$PKG_BUILD
+    rm -rf .$TARGET_NAME
+}
+
+post_makeinstall_target() {
+  mkdir -p $INSTALL/usr/config/aacs
+    cp -P KEYDB.cfg $INSTALL/usr/config/aacs
+}

packages/multimedia/libaacs/patches/libaacs-0.5.0-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libaacs-0.5.0-old/configure.ac libaacs-0.5.0-new/configure.ac
---- libaacs-0.5.0-old/configure.ac	2012-08-17 04:28:42.000000000 -0700
-+++ libaacs-0.5.0-new/configure.ac	2013-01-03 21:08:26.000000000 -0800
-@@ -24,7 +24,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE([foreign])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- 
- SET_FEATURES="-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L"

packages/multimedia/libaacs/patches/libaacs-0.5.0-bison_2.6.patch

@@ -1,30 +0,0 @@
-diff -Naur libaacs-0.4.0-old/src/file/keydbcfg-parser.y libaacs-0.4.0-new/src/file/keydbcfg-parser.y
---- libaacs-0.4.0-old/src/file/keydbcfg-parser.y	2012-05-04 04:23:42.000000000 -0700
-+++ libaacs-0.4.0-new/src/file/keydbcfg-parser.y	2012-07-21 19:20:14.000000000 -0700
-@@ -1,4 +1,8 @@
--%{
-+%code requires {
-+#include "file/keydbcfg.h"
-+}
-+
-+%code {
- /*
-  * This file is part of libaacs
-  * Copyright (C) 2010  gates
-@@ -18,7 +22,6 @@
-  * <http://www.gnu.org/licenses/>.
-  */
- 
--#include "file/keydbcfg.h"
- #include "util/macro.h"
- 
- #include <stdio.h>
-@@ -85,7 +88,7 @@
- 
- /* uncomment the line below for debugging */
- // int yydebug = 1;
--%}
-+}
- /* Options set to generate a reentrant parser that is POSIX yacc compatible
-  * The basic 'scanner' parameters are set. Also, another parameter is set
-  * to pass in a title entry list struct used to hold all title entries.

packages/multimedia/libaacs/patches/libaacs-buildfix.patch

@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index 466f7f9..0dec17f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+ AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+-SET_FEATURES="-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L"
++SET_FEATURES="-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500"
+ 
+ case "${host_os}" in
+   "")
+

packages/multimedia/libbluray/build

@@ -1,52 +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 $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-static \
-            --enable-shared \
-            --disable-werror \
-            --disable-extra-warnings \
-            --disable-optimizations \
-            --disable-examples \
-            --disable-debug \
-            --disable-bdjava \
-            --enable-libxml2 \
-            --disable-doxygen-doc \
-            --disable-doxygen-dot \
-            --disable-doxygen-man \
-            --disable-doxygen-rtf \
-            --disable-doxygen-xml \
-            --disable-doxygen-chm \
-            --disable-doxygen-chi \
-            --disable-doxygen-html \
-            --disable-doxygen-ps \
-            --disable-doxygen-pdf \
-            --with-gnu-ld
-
-make
-
-$MAKEINSTALL

packages/multimedia/libbluray/install

@@ -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 $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib

packages/multimedia/libbluray/package.mk

@@ -19,22 +19,42 @@
 ################################################################################
 
 PKG_NAME="libbluray"
-PKG_VERSION="0.2.3"
+PKG_VERSION="0.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/libbluray.html"
 PKG_URL="ftp://ftp.videolan.org/pub/videolan/libbluray/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libxml2"
-PKG_BUILD_DEPENDS="toolchain libxml2"
+PKG_BUILD_DEPENDS_TARGET="toolchain libxml2"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="libbluray: A Blu-Ray Discs playback library"
 PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs playback for media players, like VLC or MPlayer."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 if [ "$NONFREE_SUPPORT" = "yes" ]; then
   PKG_DEPENDS="$PKG_DEPENDS libaacs"
 fi
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
+                           --disable-extra-warnings \
+                           --disable-optimizations \
+                           --disable-examples \
+                           --disable-debug \
+                           --disable-bdjava \
+                           --enable-libxml2 \
+                           --disable-doxygen-doc \
+                           --disable-doxygen-dot \
+                           --disable-doxygen-man \
+                           --disable-doxygen-rtf \
+                           --disable-doxygen-xml \
+                           --disable-doxygen-chm \
+                           --disable-doxygen-chi \
+                           --disable-doxygen-html \
+                           --disable-doxygen-ps \
+                           --disable-doxygen-pdf \
+                           --with-gnu-ld"
+

packages/multimedia/libbluray/patches/libbluray-0.2.3-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libbluray-0.2.3-old/configure.ac libbluray-0.2.3-new/configure.ac
---- libbluray-0.2.3-old/configure.ac	2012-08-17 04:27:32.000000000 -0700
-+++ libbluray-0.2.3-new/configure.ac	2012-12-30 15:02:51.000000000 -0800
-@@ -22,7 +22,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE([foreign tar-ustar])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- case "${host_os}" in
-   "")

packages/multimedia/libva-driver-intel/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libva-driver-intel"
-PKG_VERSION="1.2.0"
+PKG_VERSION="1.2.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/network/avahi/package.mk

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://avahi.org/"
 PKG_URL="http://www.avahi.org/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python expat dbus connman dbus-python"
-PKG_BUILD_DEPENDS_TARGET="toolchain Python expat libdaemon dbus dbus-python"
+PKG_DEPENDS="expat dbus connman"
+PKG_BUILD_DEPENDS_TARGET="toolchain expat libdaemon dbus"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="avahi: A Zeroconf mDNS/DNS-SD responder"
@@ -51,9 +51,9 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \
                            --disable-dbm \
                            --disable-gdbm \
                            --enable-libdaemon \
-                           --enable-python \
+                           --disable-python \
                            --disable-pygtk \
-                           --enable-python-dbus \
+                           --disable-python-dbus \
                            --disable-mono \
                            --disable-monodoc \
                            --disable-autoipd \

packages/network/bluez/patches/bluez-logitech.patch

@@ -0,0 +1,12 @@
+diff -Naur bluez-5.8/tools/hid2hci.rules bluez-5.8.patch/tools/hid2hci.rules
+--- bluez-5.8/tools/hid2hci.rules	2012-12-24 18:46:55.000000000 +0100
++++ bluez-5.8.patch/tools/hid2hci.rules	2013-09-23 15:34:52.148848897 +0200
+@@ -11,7 +11,7 @@
+   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
+ 
+ # Logitech devices
+-KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
++KERNEL=="hiddev*|hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
+   RUN+="hid2hci --method=logitech-hid --devpath=%p"
+ 
+ ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"

packages/network/ethtool/build

@@ -1,35 +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 $1
-
-LDFLAGS="$LDFLAGS -fwhole-program"
-
-cd $PKG_BUILD
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-
-make

packages/network/ethtool/package.mk

@@ -19,18 +19,18 @@
 ################################################################################
 
 PKG_NAME="ethtool"
-PKG_VERSION="3.9"
+PKG_VERSION="3.11"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
 PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="ethtool: Display or change ethernet card settings"
 PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

packages/sysutils/busybox/init.d/10_cdrom

@@ -25,3 +25,4 @@
 
 progress "Setup some CDROM settings"
   sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 &
+  sysctl -w dev.cdrom.autoclose=0 > /dev/null 2>&1 &

packages/sysutils/e2fsprogs/install

@@ -39,3 +39,4 @@ mkdir -p $INSTALL/sbin
     ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
   cp $PKG_BUILD/resize/resize2fs $INSTALL/sbin
   cp $PKG_BUILD/misc/tune2fs $INSTALL/sbin
+    ln -sf tune2fs $INSTALL/sbin/e2label

packages/sysutils/fuse-exfat/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="fuse-exfat"
-PKG_VERSION="1.0.0"
+PKG_VERSION="1.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/kmod/patches/kmod-01_support-storage-.config-modprobe.d.patch

@@ -0,0 +1,24 @@
+From 0079354fada76965346bf626cbd40c9ac25f0ce3 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 21 Sep 2013 21:14:31 +0300
+Subject: [PATCH] support /storage/.config/modprobe.d
+
+---
+ libkmod/libkmod.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
+index ef83e31..a0d4bda 100644
+--- a/libkmod/libkmod.c
++++ b/libkmod/libkmod.c
+@@ -62,6 +62,7 @@ static const char *default_config_paths[] = {
+ 	SYSCONFDIR "/modprobe.d",
+ 	"/run/modprobe.d",
+ 	"/lib/modprobe.d",
++	"/storage/.config/modprobe.d",
+ 	NULL
+ };
+ 
+-- 
+1.7.2.5
+

packages/sysutils/remote/eventlircd/evmap/03_0755_2626.evmap

@@ -1,4 +1,4 @@
-# Remote 0755:2626
+# Remote 0755:2626 Aureal Semiconductor (iRF Media Technology W-01RN USB_V3.1)
 
  KEY_NUMERIC_1     = KEY_NUMERIC_1     # 1
  KEY_NUMERIC_2     = KEY_NUMERIC_2     # 2
@@ -13,28 +13,40 @@
  KEY_NUMERIC_STAR  = KEY_NUMERIC_STAR  # *
  KEY_NUMERIC_POUND = KEY_NUMERIC_POUND # #
 
+ KEY_1     = KEY_NUMERIC_1             # 1
+ KEY_2     = KEY_NUMERIC_2             # 2
+ KEY_3     = KEY_NUMERIC_3             # 3
+ KEY_4     = KEY_NUMERIC_4             # 4
+ KEY_5     = KEY_NUMERIC_5             # 5
+ KEY_6     = KEY_NUMERIC_6             # 6
+ KEY_7     = KEY_NUMERIC_7             # 7
+ KEY_8     = KEY_NUMERIC_8             # 8
+ KEY_9     = KEY_NUMERIC_9             # 9
+ KEY_0     = KEY_NUMERIC_0             # 0
+ shift+KEY_8  = KEY_NUMERIC_STAR       # *
+ shift+KEY_3  = KEY_NUMERIC_POUND      # #
+
  KEY_UP            = KEY_UP            # Up Arrow
  KEY_DOWN          = KEY_DOWN          # Down Arrow
  KEY_LEFT          = KEY_LEFT          # Left Arrow
  KEY_RIGHT         = KEY_RIGHT         # Right Arrow
 
- ctrl+shift+KEY_B     = NULL            # Rew (Hide)
+ ctrl+shift+KEY_B     = KEY_REWIND      # Rewind
  ctrl+KEY_LEFT        = NULL            # Rew (Hide)
  ctrl+shift+KEY_LEFT  = NULL            # Rew
 
+ KEY_FASTFORWARD      = KEY_FASTFORWARD # Forward
  ctrl+shift+KEY_F     = NULL            # Fwd (Hide)
  ctrl+KEY_RIGHT       = NULL            # Fwd (Hide)
  ctrl+shift+KEY_RIGHT = NULL            # Fwd
 
  alt+KEY_LEFT         = NULL            # Prev
-# KEY_PAGEUP           = NULL           # Prev
  ctrl+KEY_PAGEUP      = NULL            # Prev
- KEY_PREVIOUSSONG     = KEY_PREVIOUS    # Prev
+ KEY_PREVIOUSSONG     = KEY_PREVIOUS    # Replay
  
  alt+KEY_DOWN         = NULL            # Next
-# KEY_PAGEDOWN         = NULL           # Next
  ctrl+KEY_PAGEDOWN    = NULL            # Next
- KEY_NEXTSONG         = KEY_NEXT        # Next
+ KEY_NEXTSONG         = KEY_NEXT        # Skip
 
  KEY_SPACE          = NULL              # Play/Pause
  KEY_PLAYPAUSE      = KEY_PLAY          # Play/Pause
@@ -51,9 +63,8 @@
  KEY_MUTE          = KEY_MUTE          # Mute
 
  KEY_RED           = KEY_RED           # Red Key
-# ctrl+KEY_M        = KEY_GREEN        # Green Key
-# ctrl+KEY_I        = KEY_YELLOW       # Yellow Key
-# ctrl+shift+KEY_M  = KEY_BLUE         # Blue Key
+ KEY_HOMEPAGE      = KEY_GREEN         # Green Key
+ KEY_MAIL          = KEY_YELLOW        # Yellow Key
 
  alt+meta+KEY_ENTER = KEY_PROG1        # Home
  ctrl+KEY_M        = KEY_AUDIO         # Music
@@ -61,7 +72,9 @@
  ctrl+shift+KEY_M  = KEY_DVD           # DVD/VCD
  ctrl+KEY_E        = KEY_VIDEO         # Videos
  KEY_RADIO         = KEY_RADIO         # Radio
+ ctrl+KEY_A        = KEY_RADIO         # Radio
  KEY_TUNER         = KEY_TUNER         # Tuner
+ ctrl+shift+KEY_T  = KEY_TUNER         # Tuner
  KEY_PVR           = KEY_TV            # PVR
 
  meta+KEY_EQUAL    = KEY_INFO          # Zoom
@@ -76,5 +89,14 @@
  KEY_OK            = KEY_OK            # Ok
  KEY_DELETE        = KEY_DELETE        # Clear
  KEY_EXIT          = KEY_EXIT          # BACK
+ KEY_BACKSPACE     = KEY_EXIT          # BACK
 
  KEY_POWER         = KEY_POWER         # Power
+
+ alt+KEY_F4        = KEY_CLOSE         # Close
+ meta+KEY_D        = KEY_INFO          # Desktop, remapped to Info in XBMC
+ KEY_COMPOSE       = KEY_EPG           # More, remapped to Context Menu in XBMC
+ ctrl+KEY_R        = KEY_RECORD        # Record
+ KEY_BACK          = KEY_BACK          # Previous
+ KEY_FORWARD       = KEY_FORWARD       # Next
+ KEY_ESC           = KEY_DELETE        # Clear

packages/sysutils/remote/eventlircd/evmap/03_1241_e000.evmap

@@ -27,10 +27,15 @@
  ctrl+shift+KEY_P   = KEY_PLAY          # Play
  ctrl+shift+KEY_F   = KEY_FASTFORWARD   # Fwd
  KEY_PREVIOUSSONG   = KEY_PREVIOUS      # Prev
+ KEY_KPASTERISK     = KEY_PREVIOUS      # Prev
  KEY_NEXTSONG       = KEY_NEXT          # Next
+ ctrl+KEY_F         = KEY_NEXT          # Next
 
  KEY_BACKSPACE      = KEY_EXIT          # BACK/Clear
+ ctrl+KEY_B         = KEY_BACK          # BACK/Clear
  BTN_RIGHT          = KEY_INFO          # Info/EPG
+ KEY_F1             = KEY_INFO          # Info/EPG
+ KEY_COMPOSE        = KEY_INFO          # Info/EPG
  alt+meta+KEY_ENTER = KEY_PROG1         # Media
 
  KEY_LEFT           = KEY_LEFT          # Left Arrow
@@ -39,18 +44,27 @@
  KEY_DOWN           = KEY_DOWN          # Down Arrow
  KEY_ENTER          = KEY_OK            # Enter & Ok
  KEY_VOLUMEUP       = KEY_VOLUMEUP      # Vol +
+ KEY_F10            = KEY_VOLUMEUP      # Vol +
  KEY_VOLUMEDOWN     = KEY_VOLUMEDOWN    # Vol -
+ KEY_F9             = KEY_VOLUMEDOWN    # Vol -
  KEY_PAGEUP         = KEY_CHANNELUP     # CH/PG up
  KEY_PAGEDOWN       = KEY_CHANNELDOWN   # CH/PG down
  KEY_F8             = KEY_MUTE          # Mute
 
- ctrl+shift+KEY_T   = KEY_TEXT          # Teletext
+ ctrl+shift+KEY_T   = KEY_SUBTITLE      # Teletext
+ ctrl+shift+KEY_C   = KEY_SUBTITLE      # Teletext
+ ctrl+KEY_U         = KEY_SUBTITLE      # Subtitles
  ctrl+KEY_G         = KEY_EPG           # Program # remapped to EPG (Contextmenu)
 
  KEY_VIDEO          = KEY_VIDEO         # Videos
  KEY_DVD            = KEY_DVD           # DVD
+ ctrl+shift+KEY_M   = KEY_DVD           # DVD
  KEY_MP3            = KEY_AUDIO         # Music
+ ctrl+KEY_M         = KEY_AUDIO         # Audio
  KEY_CAMERA         = KEY_CAMERA        # Pictures
+ ctrl+KEY_T         = KEY_TUNER         # LiveTV
+ ctrl+KEY_E         = KEY_TUNER         # TV
+ ctrl+KEY_O         = KEY_PVR           # RecordedTV
 
 #  KEY_RED          = KEY_RED           # Red
  ctrl+KEY_I         = KEY_GREEN         # Green

packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap

@@ -0,0 +1,49 @@
+# 1d57:ac01 MS-Tech
+
+ KEY_POWER          = KEY_POWER         # Power
+
+ KEY_1              = KEY_NUMERIC_1     # 1
+ KEY_2              = KEY_NUMERIC_2     # 2
+ KEY_3              = KEY_NUMERIC_3     # 3
+ KEY_4              = KEY_NUMERIC_4     # 4
+ KEY_5              = KEY_NUMERIC_5     # 5
+ KEY_6              = KEY_NUMERIC_6     # 6
+ KEY_7              = KEY_NUMERIC_7     # 7
+ KEY_8              = KEY_NUMERIC_8     # 8
+ KEY_9              = KEY_NUMERIC_9     # 9
+ KEY_0              = KEY_NUMERIC_0     # 0
+ shift+KEY_8        = KEY_NUMERIC_STAR  # *
+ shift+KEY_3        = KEY_NUMERIC_POUND # #
+
+ KEY_VOLUMEUP       = KEY_VOLUMEUP      # Vol +
+ KEY_VOLUMEDOWN     = KEY_VOLUMEDOWN    # Vol -
+ KEY_MUTE           = KEY_MUTE          # Mute
+ KEY_PAGEUP         = KEY_CHANNELUP     # CH/PG up
+ KEY_PAGEDOWN       = KEY_CHANNELDOWN   # CH/PG down
+ ctrl+KEY_F         = KEY_NEXT          # Next
+ ctrl+KEY_B         = KEY_PREVIOUS      # Prev
+
+ KEY_DELETE         = KEY_DELETE        # Delete/Clear
+ alt+KEY_F4         = KEY_EXIT          # Exit
+ KEY_BACKSPACE      = KEY_EXIT          # Back
+
+ KEY_LEFT           = KEY_LEFT          # Left Arrow
+ KEY_RIGHT          = KEY_RIGHT         # Right Arrow
+ KEY_UP             = KEY_UP            # Up Arrow
+ KEY_DOWN           = KEY_DOWN          # Down Arrow
+ KEY_ENTER          = KEY_OK            # Enter & Ok
+
+ KEY_COMPOSE        = KEY_INFO          # Info
+ ctrl+KEY_R         = KEY_RECORD        # Record
+ ctrl+KEY_P         = KEY_PAUSE         # Pause
+ ctrl+shift+KEY_S   = KEY_STOP          # Stop
+ ctrl+shift+KEY_B   = KEY_REWIND        # Rev
+ ctrl+shift+KEY_P   = KEY_PLAY          # Play
+ ctrl+shift+KEY_F   = KEY_FASTFORWARD   # Fwd
+
+ ctrl+shift+KEY_M   = KEY_DVD           # DVD
+ ctrl+shift+KEY_A   = KEY_AUDIO         # Audio
+ ctrl+shift+KEY_T   = KEY_TUNER         # LiveTV
+ ctrl+KEY_U         = KEY_SUBTITLE      # Subtitles
+ ctrl+KEY_G         = KEY_EPG           # Guide # remapped to EPG (Contextmenu)
+ alt+KEY_ENTER      = KEY_PROG1         # Media/Switch Windows

packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules

@@ -147,6 +147,10 @@ ENV{ID_VENDOR_ID}=="18b1", ENV{ID_MODEL_ID}=="0037", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
 
+ENV{ID_VENDOR_ID}=="1d57", ENV{ID_MODEL_ID}=="ac01", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
+
 #ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \
 ATTRS{idVendor}=="9022", ATTRS{idProduct}=="d660", \
   ENV{eventlircd_enable}="true", \
@@ -164,12 +168,14 @@ ENV{ID_VENDOR_ID}=="0471", ENV{ID_MODEL_ID}=="20cc", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="spinelplus.evmap"
 
-
 # Enable wake-on-usb for the USB remotes.
   RUN+="wakeup_enable"
 
 LABEL="end-usb"
 
+# Set default delays (1000ms for first repeat, to avoid multiple keypresses).
+  RUN+="/usr/bin/ir-keytable --delay=1000 --device=$devnode"
+
 #-------------------------------------------------------------------------------
 # Ask eventlircd to handle Bluetooth HID devices that show up as event devices
 # and are known to be remote controls. For simplicity, the event map file names

packages/sysutils/systemd/tmpfiles.d/11_udev.conf

@@ -1,21 +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
-################################################################################
-
-L /run/modprobe.d - - - - /storage/.config/modprobe.d

packages/sysutils/timezone-data/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="timezone-data"
-PKG_VERSION="2011n"
+PKG_VERSION="2013d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Public Domain"

packages/sysutils/udevil/config/udevil.conf

@@ -218,6 +218,7 @@ default_options_file      = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID,
 default_options_iso9660   = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro, utf8
 default_options_udf       = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
 default_options_vfat      = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, utf8
+default_options_exfat     = nosuid, noexec, nodev, noatime, utf8, nonempty
 default_options_msdos     = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID
 default_options_umsdos    = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID
 default_options_ntfs      = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, utf8
@@ -248,6 +249,7 @@ allowed_options_smbfs     = nosuid, noexec, nodev, ro, rw, remount, port=*, user
 allowed_options_sshfs     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, nonempty, allow_other, idmap=user, BatchMode=yes, port=*
 allowed_options_curlftpfs = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, nonempty, allow_other, user=*
 allowed_options_ftpfs     = nosuid, noexec, nodev, noatime, ro, rw, port=*, user=*, pass=*, ip=*, root=*, uid=$UID, gid=$GID
+allowed_options_exfat     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, utf8, nonempty
 
 
 # mount_point_mode, if present and set to a non-empty value, will cause udevil

packages/sysutils/udevil/package.mk

@@ -49,6 +49,9 @@ post_makeinstall_target() {
   mkdir -p $INSTALL/etc/udevil
     cp $PKG_DIR/config/udevil.conf $INSTALL/etc/udevil
 
+  mkdir -p $INSTALL/lib/udev
+    cp $PKG_DIR/scripts/udevil_helper $INSTALL/lib/udev
+
   mkdir -p $INSTALL/usr/bin
     cp -PR src/udevil $INSTALL/usr/bin
 }

packages/sysutils/udevil/scripts/udevil_helper

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,8 +19,23 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+case "$ACTION" in
+  add)
+    # check hfsplus filesystems
+    if [ "$ID_FS_TYPE" = "hfsplus" -a -x /bin/fsck.hfsplus ]; then
+      /bin/fsck.hfsplus -r -y $DEVNAME
+    fi
+    udevil --mount $DEVNAME
+    ;;
 
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/ethtool $INSTALL/usr/sbin
+  change)
+    udevil --umount $DEVNAME
+    udevil --mount $DEVNAME
+    ;;
 
+  remove)
+    udevil --umount $DEVNAME
+    ;;
+esac
+
+exit 0

packages/sysutils/udevil/udev.d/95-udevil-mount.rules

@@ -4,21 +4,11 @@ ENV{installer}=="1", GOTO="exit"
 
 # check for blockdevices, /dev/sd* and /dev/sr*
 SUBSYSTEM!="block", KERNEL!="sd*|sr*",GOTO="exit"
+IMPORT{builtin}="blkid"
 
-# /dev/sd* with partitions only and /dev/sr* disks only
-KERNEL=="sd*", ENV{DEVTYPE}=="partition", GOTO="harddisk"
-KERNEL=="sr*", ENV{DEVTYPE}=="disk", GOTO="optical"
-GOTO="exit"
-
-# mount or umount for hdds
-LABEL="harddisk"
-ACTION=="add", RUN+="/usr/bin/udevil --mount /dev/%k"
-ACTION=="remove", RUN+="/usr/bin/udevil --umount /dev/%k"
-GOTO="exit"
-
-# mount or umount for opticals
-LABEL="optical"
-ACTION=="add|change", RUN+="/usr/bin/udevil --umount /dev/%k", RUN+="/usr/bin/udevil --mount /dev/%k"
+# /dev/sd* with partitions/disk and filesystems only and /dev/sr* disks only
+KERNEL=="sd*", ENV{DEVTYPE}=="partition|disk", ENV{ID_FS_USAGE}=="filesystem", RUN+="udevil_helper"
+KERNEL=="sr*", ENV{DEVTYPE}=="disk", RUN+="udevil_helper"
 GOTO="exit"
 
 # Exit

packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-11-fix_keytables_xbox360-0.1.patch

@@ -1,7 +1,7 @@
 diff -rupN v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
 --- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce	2011-08-19 19:08:11.000000000 +0200
 +++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce	2011-09-22 21:50:44.000000000 +0200
-@@ -60,3 +60,67 @@
+@@ -60,3 +60,69 @@
  0x800f046f KEY_MEDIA
  0x800f0480 KEY_BRIGHTNESSDOWN
  0x800f0481 KEY_PLAYPAUSE
@@ -20,12 +20,15 @@ diff -rupN v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.pat
 +0x800f740b KEY_ENTER
 +0x800f740c KEY_SLEEP
 +0x800f740d KEY_MEDIA
++0x800f7464 KEY_MEDIA
 +0x800f740e KEY_MUTE
 +0x800f740f KEY_INFO
 +0x800f7410 KEY_VOLUMEUP
 +0x800f7411 KEY_VOLUMEDOWN
 +0x800f7412 KEY_CHANNELUP
++0x800f746C KEY_CHANNELUP
 +0x800f7413 KEY_CHANNELDOWN
++0x800f746D KEY_CHANNELDOWN
 +0x800f7414 KEY_FASTFORWARD
 +0x800f7415 KEY_REWIND
 +0x800f7416 KEY_PLAY
@@ -68,4 +71,3 @@ diff -rupN v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.pat
 +0x800f746f KEY_PLAYER
 +0x800f7480 KEY_BRIGHTNESSDOWN
 +0x800f7481 KEY_PLAYPAUSE
-+

packages/sysutils/v4l-utils/patches/v4l-utils-0.8.3-12-add_zbox_ad10_support-0.1.patch

@@ -1,18 +1,11 @@
 diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
---- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce	2011-09-29 16:58:43.791771663 +0200
-+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce	2011-09-29 16:59:59.449760665 +0200
-@@ -60,6 +60,7 @@
- 0x800f046f KEY_MEDIA
- 0x800f0480 KEY_BRIGHTNESSDOWN
- 0x800f0481 KEY_PLAYPAUSE
-+
- #xbox360 remote
- 0x800f7400 KEY_NUMERIC_0
- 0x800f7401 KEY_NUMERIC_1
-@@ -124,3 +125,47 @@
+--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce	2013-09-22 13:54:18.609413831 +0200
++++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce	2013-09-22 13:56:37.641651436 +0200
+@@ -126,3 +127,48 @@
+ 0x800f746f KEY_PLAYER
  0x800f7480 KEY_BRIGHTNESSDOWN
  0x800f7481 KEY_PLAYPAUSE
- 
++
 +Zotac AD10 Remote
 +0x8034048e KEY_POWER
 +0x8034043d KEY_POWER

packages/toolchain/devel/eglibc/build

@@ -97,6 +97,7 @@ cat >option-groups.config <<EOF
 # needed for example with glib and Python:
   OPTION_EGLIBC_LOCALE_CODE = y
 
+# activeperl fails without libnsl. keep it enabled for now
   OPTION_EGLIBC_NIS = y
   OPTION_EGLIBC_NSSWITCH = y
   OPTION_EGLIBC_RCMD = n

packages/toolchain/devel/eglibc/config/gai.conf

@@ -60,6 +60,6 @@ precedence ::ffff:0:0/96  100
 #    used.  Changing these defaults should hardly ever be necessary.
 #    The defaults are equivalent to:
 #
-#scopev4 ::ffff:169.254.0.0/112  2
-#scopev4 ::ffff:127.0.0.0/104    2
-#scopev4 ::ffff:0.0.0.0/96       14
+scopev4 ::ffff:169.254.0.0/112  2
+scopev4 ::ffff:127.0.0.0/104    2
+scopev4 ::ffff:0.0.0.0/96       14

packages/toolchain/devel/eglibc/config/host.conf

@@ -0,0 +1 @@
+multi on

packages/toolchain/devel/eglibc/config/nsswitch.conf

@@ -3,17 +3,17 @@
 # Example configuration of GNU Name Service Switch functionality.
 #
 
-passwd:		db files
-group:		db files
-shadow:		db files
+passwd:		files
+group:		files
+shadow:		files
 gshadow:	files
 
 hosts:		files dns
 networks:	files dns
 
-protocols:	db files
-services:	db files
-ethers:		db files
-rpc:		db files
+protocols:	files
+services:	files
+ethers:		files
+rpc:		files
 
-netgroup:	db files
+netgroup:	files

packages/toolchain/devel/eglibc/install

@@ -50,6 +50,8 @@ mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/objdir-$1/elf/ldd $INSTALL/usr/bin
   sed -i 's%/usr/bin/bash%/bin/sh%g' $INSTALL/usr/bin/ldd
 
+  cp $PKG_BUILD/objdir-$1/nss/getent $INSTALL/usr/bin
+
   cp $PKG_BUILD/objdir-$1/locale/locale $INSTALL/usr/bin
 
 # libiconv replacement:
@@ -59,5 +61,6 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc
+  cp $PKG_DIR/config/host.conf $INSTALL/etc
   cp $PKG_DIR/config/gai.conf $INSTALL/etc
   cp $PKG_BUILD/sunrpc/etc.rpc $INSTALL/etc/rpc

packages/tools/bcm2835-bootloader/files/create_sdcard

@@ -51,7 +51,7 @@ fi
 
 DISK="$1"
 case $DISK in
-  "/dev/mmcblk1"*)
+  "/dev/mmcblk"*)
     PART1="${DISK}p1"
     PART2="${DISK}p2"
     ;;

packages/tools/bcm2835-bootloader/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="7d8a762"
+PKG_VERSION="86e7643"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

packages/tools/bcm2835-bootloader/scripts/update.sh

@@ -27,10 +27,10 @@
   mount -o remount,rw $BOOT_ROOT
 
 # update bootloader files
-  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/fixup.dat $BOOT_ROOT
-  cp $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
 
 # cleanup not more needed files
   rm -rf $BOOT_ROOT/loader.bin
@@ -39,7 +39,7 @@
 
 # some config.txt magic
   if [ ! -f $BOOT_ROOT/config.txt ]; then
-    cp $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
   elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then
     mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk
     cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \

packages/tools/syslinux/files/create_virtualimage

@@ -225,6 +225,8 @@ echo "storage size: $STORAGE_SIZE MB"
     MBR="/usr/lib/syslinux/mbr.bin"       # example: debian, ubuntu
   elif [ -f /usr/share/syslinux/mbr.bin ]; then
     MBR="/usr/share/syslinux/mbr.bin"     # example: fedora
+  elif [ -f /usr/lib/syslinux/bios/mbr.bin ]; then
+    MBR="/usr/lib/syslinux/bios/mbr.bin"
   else
     echo "Can't find syslinux's mbr.bin on Host OS"
     exit 1