Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/lang/Python/install

@@ -39,6 +39,11 @@ mkdir -p $PYTHON_LIB_DIR/config
 mkdir -p $PYTHON_LIB_DIR/lib-dynload
   cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload
 
+# Todo: sometimes Python dont build '_socket.so' for some reasons and continues without failing,
+# let it fail in this way, to be sure '_socket.so' will be installed-  a rebuild of Python fixes
+# the issue in most cases:
+  cp $PKG_BUILD/.objdir-target/build/lib*/_socket.so $PYTHON_LIB_DIR/lib-dynload
+
 cp -R $PKG_BUILD/.objdir-target/Lib/* $PYTHON_LIB_DIR
 
 # For future 3rd-parties Python modules

packages/linux-drivers/bcm_sta/build

@@ -27,4 +27,4 @@ cd $PKG_BUILD
 [ "$TARGET_ARCH" = "i386" ] && cd x86-32
 [ "$TARGET_ARCH" = "x86_64" ] && cd x86-64
 
-KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$ARCH
+KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$TARGET_ARCH