Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-pvr

packages/graphics/Mesa/build

@@ -43,13 +43,13 @@ fi
 
 for drv in $GRAPHIC_DRIVERS; do
   if [ "$drv" = i915 ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/enable-gallium-i915/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+    # MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
   fi
 
   if [ "$drv" = i965 ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/enable-gallium-i965/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+    # MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
   fi
 
   if [ "$drv" = r300 -o "$drv" = radeon ]; then

packages/graphics/libdrm/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.25"
+PKG_VERSION="2.4.26"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -117,10 +117,8 @@ NFS_OVERLAY="192.168.1.1:/var/lib/overlay"
   }
 
   mount_part() {
-    progress "trying to mount $1 ..."
+    progress "check filesystem $1 ..."
-
+      /sbin/fsck -M -T -a $1 > /dev/null 2>&1
-      progress "check filesystem $1 ..."
-        $IONICE /sbin/fsck -y $1 > /dev/null 2>&1
 
       for i in 1 2 3 4 5 6 7 8 9 10; do
         ERR_ENV=1

packages/initramfs/sysutils/e2fsprogs-initramfs/install

@@ -33,7 +33,6 @@ mkdir -p $INSTALL/sbin
     ln -sf e2fsck $INSTALL/sbin/fsck.ext3
     ln -sf e2fsck $INSTALL/sbin/fsck.ext4
     ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
-  cp $E2FSPROGS_DIR/misc/fsck $INSTALL/sbin
 
 mkdir -p $INSTALL/lib
   cp -P $E2FSPROGS_DIR/lib/e2p/libe2p.so.* $INSTALL/lib

packages/initramfs/sysutils/util-linux-initramfs/install

@@ -26,6 +26,7 @@ UTIL_LINUX_DIR="$BUILD/util-linux-*"
 
 mkdir -p $INSTALL/sbin
   cp -P $UTIL_LINUX_DIR/misc-utils/.libs/blkid $INSTALL/sbin
+  cp -P $UTIL_LINUX_DIR/fsck/.libs/fsck $INSTALL/sbin
 
 mkdir -p $INSTALL/lib
   cp -P $UTIL_LINUX_DIR/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/lib

packages/sysutils/e2fsprogs/build

@@ -44,7 +44,7 @@ cd $PKG_BUILD
             --disable-debugfs \
             --disable-imager \
             --enable-resizer \
-            --enable-fsck \
+            --disable-fsck \
             --disable-e2initrd-helper \
             --enable-tls \
             --disable-uuidd \
@@ -53,4 +53,3 @@ cd $PKG_BUILD
             --with-gnu-ld \
 
 make
-

packages/sysutils/e2fsprogs/install

@@ -31,7 +31,6 @@ mkdir -p $INSTALL/sbin
     ln -sf e2fsck $INSTALL/sbin/fsck.ext3
     ln -sf e2fsck $INSTALL/sbin/fsck.ext4
     ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
-  cp $PKG_BUILD/misc/fsck $INSTALL/sbin
   cp $PKG_BUILD/misc/mke2fs $INSTALL/sbin
     ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
     ln -sf mke2fs $INSTALL/sbin/mkfs.ext3

packages/sysutils/ntfs-3g_ntfsprogs/build

@@ -32,10 +32,10 @@ cd $PKG_BUILD
             --with-fuse=external \
             --disable-library \
             --enable-posix-acls \
-            --disable-mtab \
+            --enable-mtab \
-            --disable-ntfsprogs \
+            --enable-ntfsprogs \
-            --disable-crypto \
+            --enable-crypto \
             --with-fuse=external \
-            --without-uuid \
+            --with-uuid \
 
 make

packages/sysutils/ntfs-3g_ntfsprogs/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.ntfs-3g.org/"
 PKG_URL="http://tuxera.com/opensource/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS="fuse"
+PKG_DEPENDS="fuse gnutls"
-PKG_BUILD_DEPENDS="toolchain fuse"
+PKG_BUILD_DEPENDS="toolchain fuse gnutls"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="ntfs-3g_ntfsprogs: NTFS-3G Read/Write userspace driver"

packages/sysutils/parted/build

@@ -22,6 +22,9 @@
 
 . config/options $1
 
+# parted fails to build with GOLD linker
+  strip_gold
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -33,7 +36,9 @@ cd $PKG_BUILD
             --enable-shared \
             --disable-device-mapper \
             --without-readline \
+            --disable-rpath \
+            --with-gnu-ld \
 
-make
+make V=1
 
 $MAKEINSTALL

packages/sysutils/parted/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="parted"
-PKG_VERSION="2.3"
+PKG_VERSION="3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/sysutils/udisks/init.d/31_mount-disks

@@ -40,7 +40,6 @@
     USAGE="`show_info "usage" $DEVICE`"
 
     if [ "$REMOVABLE" = "0" -a "$MOUNTED" = "0" -a "$USAGE" = "filesystem" ]; then
-      fsck "$DEVICE" >/dev/null
       udisks --mount "$DEVICE" >/dev/null
     fi
 

packages/sysutils/util-linux/build

@@ -78,6 +78,7 @@ gt_cv_func_gnugettext1_libintl=no \
 
 make -C mount mount
 make -C mount umount
+make -C fsck fsck
 make -C mount swapon
 make -C misc-utils blkid
 make -C sys-utils fstrim

packages/sysutils/util-linux/install

@@ -31,6 +31,7 @@ mkdir -p $INSTALL/sbin
   cp $PKG_BUILD/sys-utils/fstrim $INSTALL/sbin
   cp $PKG_BUILD/mount/.libs/swapon $INSTALL/sbin
   ln -sf swapon $INSTALL/sbin/swapoff
+  cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/sbin
 
 mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/usr/lib

packages/sysutils/util-linux/udev.d/10-fsck.rules

@@ -21,7 +21,7 @@
 
 SUBSYSTEM!="block", GOTO="end"
 
-ACTION=="add|change", RUN+="/sbin/fsck -y /dev/%k"
+ACTION=="add|change", RUN+="/sbin/fsck -M -T -a /dev/%k"
 
 # exit
 LABEL="end"