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

config/noobs/partitions.json

@@ -1,20 +1,20 @@
 {
   "partitions": [
     {
-      "label": "System",
-      "filesystem_type": "FAT",
-      "partition_size_nominal: "128",
-      "want_maximised": "false",
-      "uncompressed_tarball_size": 128,
-      "mkfs_options": ""
+      "label":                     "System",
+      "filesystem_type":           "FAT",
+      "partition_size_nominal":    128,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 110,
+      "mkfs_options":              ""
     },
     {
-      "label": "Storage",
-      "filesystem_type": "ext4",
-      "partition_size_nominal: "864",
-      "want_maximised": "true",
-      "uncompressed_tarball_size": 512,
-      "mkfs_options": ""
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
     }
-  ],
+  ]
 }

packages/lang/Python/build

@@ -89,9 +89,8 @@ INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax wsgiref"
 mkdir -p ./Lib
 cp ../Lib/*.py ./Lib
 
-for dirs in $INCLUDE_DIRS; do
-  mkdir -p ./Lib/$dirs
-  cp ../Lib/$dirs/*.py ./Lib/$dirs
+for dir in $INCLUDE_DIRS; do
+  cp -a ../Lib/$dir ./Lib/
 done
 
 python -Wi -t -B ../Lib/compileall.py ./Lib -f

packages/linux/meta

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

packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch

@@ -0,0 +1,25 @@
+From 6d64d70a46b8f238d2706017a084f30bd681f291 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 31 Aug 2013 13:44:53 +0300
+Subject: [PATCH] show all removable disks  mounted under /media
+
+---
+ xbmc/storage/linux/UDevProvider.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
+index c20facc..c1044c8 100644
+--- a/xbmc/storage/linux/UDevProvider.cpp
++++ b/xbmc/storage/linux/UDevProvider.cpp
+@@ -151,7 +151,7 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable)
+     if (removable  &&
+       ((bus        && strstr(bus, "usb")) ||
+        (cdrom      && strstr(cdrom,"1"))  ||
+-       (mountpoint && strstr(mountpoint, "usb"))))
++       (mountpoint)))
+     {
+       const char *label = udev_device_get_property_value(device, "ID_FS_LABEL");
+       if (!label)
+-- 
+1.7.2.5
+

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

@@ -1,3 +1,7 @@
+# dont run in "installer" mode
+IMPORT{cmdline}="installer"
+ENV{installer}=="1", GOTO="exit"
+
 # check for blockdevices, /dev/sd* and /dev/sr*
 SUBSYSTEM!="block", KERNEL!="sd*|sr*",GOTO="exit"
 

projects/ARCTIC_MC/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/ATV/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/Fusion/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/Generic/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/Generic_OSS/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/ION/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/Intel/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/RPi/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

projects/Virtual/options

@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"

scripts/image

@@ -289,7 +289,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 
       cp $ROOT/README* $RELEASE_DIR
       cp $ROOT/CHANGELOG $RELEASE_DIR/release_notes.txt
-      cp -R $CONFIG/release/openelec.ico $RELEASE_DIR
 
 
       sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
@@ -332,12 +331,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
       mkdir -p $RELEASE_DIR/Storage
 
     # remove an previous created release tarball
-      rm -rf $RELEASE_DIR/System.tar.gz
-      rm -rf $RELEASE_DIR/Storage.tar.gz
+      rm -rf $RELEASE_DIR/System.tar.xz
+      rm -rf $RELEASE_DIR/Storage.tar.xz
 
     # create filesystem tarballs
-      tar czf $RELEASE_DIR/System.tar.gz -C $RELEASE_DIR/System/ .
-      tar czf $RELEASE_DIR/Storage.tar.gz -C $RELEASE_DIR/Storage/ .
+      tar cJf $RELEASE_DIR/System.tar.xz -C $RELEASE_DIR/System/ .
+      tar cJf $RELEASE_DIR/Storage.tar.xz -C $RELEASE_DIR/Storage/ .
 
     # remove an filesystem dirs
       rm -rf $RELEASE_DIR/System
@@ -352,4 +351,3 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
     # cleanup release dir
       rm -rf $RELEASE_DIR
   fi
-