diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index 4da2e2644f..1fa5ad7532 100755 --- a/packages/graphics/Mesa/build +++ b/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="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium" + 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" fi if [ "$drv" = i965 ]; then - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/enable-gallium-i965/'` - MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium" + 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" fi if [ "$drv" = r300 -o "$drv" = radeon ]; then diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index 4c08677253..0d6f1acc8b 100644 --- a/packages/graphics/libdrm/meta +++ b/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" diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 771955e334..031bb7388f 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/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 ..." - $IONICE /sbin/fsck -y $1 > /dev/null 2>&1 + progress "check filesystem $1 ..." + /sbin/fsck -M -T -a $1 > /dev/null 2>&1 for i in 1 2 3 4 5 6 7 8 9 10; do ERR_ENV=1 diff --git a/packages/initramfs/sysutils/e2fsprogs-initramfs/install b/packages/initramfs/sysutils/e2fsprogs-initramfs/install index 28e889166e..20ee681f73 100755 --- a/packages/initramfs/sysutils/e2fsprogs-initramfs/install +++ b/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 diff --git a/packages/initramfs/sysutils/util-linux-initramfs/install b/packages/initramfs/sysutils/util-linux-initramfs/install index 27cd485e33..f6f52dc062 100755 --- a/packages/initramfs/sysutils/util-linux-initramfs/install +++ b/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 diff --git a/packages/sysutils/e2fsprogs/build b/packages/sysutils/e2fsprogs/build index 372b0f6b0a..93a7dcb5d5 100755 --- a/packages/sysutils/e2fsprogs/build +++ b/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 - diff --git a/packages/sysutils/e2fsprogs/install b/packages/sysutils/e2fsprogs/install index 27cb510f22..41e7d9399a 100755 --- a/packages/sysutils/e2fsprogs/install +++ b/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 diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/build b/packages/sysutils/ntfs-3g_ntfsprogs/build index ed0da1680a..77b1c60433 100755 --- a/packages/sysutils/ntfs-3g_ntfsprogs/build +++ b/packages/sysutils/ntfs-3g_ntfsprogs/build @@ -32,10 +32,10 @@ cd $PKG_BUILD --with-fuse=external \ --disable-library \ --enable-posix-acls \ - --disable-mtab \ - --disable-ntfsprogs \ - --disable-crypto \ + --enable-mtab \ + --enable-ntfsprogs \ + --enable-crypto \ --with-fuse=external \ - --without-uuid \ + --with-uuid \ make diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/meta b/packages/sysutils/ntfs-3g_ntfsprogs/meta index 270623ef5e..009ad5bff1 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/meta +++ b/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_BUILD_DEPENDS="toolchain fuse" +PKG_DEPENDS="fuse gnutls" +PKG_BUILD_DEPENDS="toolchain fuse gnutls" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="ntfs-3g_ntfsprogs: NTFS-3G Read/Write userspace driver" diff --git a/packages/sysutils/parted/build b/packages/sysutils/parted/build index fe91b0e35d..5e4caa08ac 100755 --- a/packages/sysutils/parted/build +++ b/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 diff --git a/packages/sysutils/parted/meta b/packages/sysutils/parted/meta index 951768d0cc..1d4281fcf8 100644 --- a/packages/sysutils/parted/meta +++ b/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" diff --git a/packages/sysutils/udisks/init.d/31_mount-disks b/packages/sysutils/udisks/init.d/31_mount-disks index 40180cfa2f..a02d14aebd 100644 --- a/packages/sysutils/udisks/init.d/31_mount-disks +++ b/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 diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build index a608be4f31..41784d43dd 100755 --- a/packages/sysutils/util-linux/build +++ b/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 diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install index 94eee4e547..211f55ca24 100755 --- a/packages/sysutils/util-linux/install +++ b/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 diff --git a/packages/sysutils/e2fsprogs/udev.d/10-fsck.rules b/packages/sysutils/util-linux/udev.d/10-fsck.rules similarity index 95% rename from packages/sysutils/e2fsprogs/udev.d/10-fsck.rules rename to packages/sysutils/util-linux/udev.d/10-fsck.rules index 7077d860e8..9ffbafe59a 100644 --- a/packages/sysutils/e2fsprogs/udev.d/10-fsck.rules +++ b/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"