From 52c745ff15ee8b577236cc0282be78827dcd0310 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 4 Jun 2011 14:45:53 +0200 Subject: [PATCH 01/15] Mesa: fix build if intel dri support Signed-off-by: Stephan Raue --- packages/graphics/Mesa/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From a7c1aca8ec8d89a9c19f4dd0dae82fbb0d585bef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 4 Jun 2011 14:46:37 +0200 Subject: [PATCH 02/15] ntfs-3g_ntfsprogs: depends on gnutls Signed-off-by: Stephan Raue --- packages/sysutils/ntfs-3g_ntfsprogs/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From dc8256cb78612dd59befe5414cf56be05b880f2f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 4 Jun 2011 14:48:11 +0200 Subject: [PATCH 03/15] parted: update to parted-3.0 Signed-off-by: Stephan Raue --- packages/sysutils/parted/build | 7 ++++++- packages/sysutils/parted/meta | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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" From c7e0dbf6acebf355bcd187b1dc4280346d4639c6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:03:08 +0200 Subject: [PATCH 04/15] util-linux: build and install util-linux's fsck applet Signed-off-by: Stephan Raue --- packages/sysutils/util-linux/build | 1 + packages/sysutils/util-linux/install | 1 + 2 files changed, 2 insertions(+) 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 From 71e0406a6f55b9ca6ec6c6c8890921958c31b5ac Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:03:47 +0200 Subject: [PATCH 05/15] util-linux-initramfs: install util-linux's fsck applet Signed-off-by: Stephan Raue --- packages/initramfs/sysutils/util-linux-initramfs/install | 1 + 1 file changed, 1 insertion(+) 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 From 8ceca5a049abdc61c7f5a8293f370ae4d7e290b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:04:25 +0200 Subject: [PATCH 06/15] e2fsprogs: dont install e2fsprogs's fsck applet Signed-off-by: Stephan Raue --- packages/sysutils/e2fsprogs/install | 1 - 1 file changed, 1 deletion(-) 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 From 3bea32755da3e072750ab024d9a5af5cd1a06680 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:04:40 +0200 Subject: [PATCH 07/15] e2fsprogs-initramfs: dont install e2fsprogs's fsck applet Signed-off-by: Stephan Raue --- packages/initramfs/sysutils/e2fsprogs-initramfs/install | 1 - 1 file changed, 1 deletion(-) 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 From 1e0941fbd7ef43d7a6f1491d00e58f66dc4b63ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:05:16 +0200 Subject: [PATCH 08/15] util-linux: move udev rule from e2fsprogs to here Signed-off-by: Stephan Raue --- .../sysutils/{e2fsprogs => util-linux}/udev.d/10-fsck.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename packages/sysutils/{e2fsprogs => util-linux}/udev.d/10-fsck.rules (93%) diff --git a/packages/sysutils/e2fsprogs/udev.d/10-fsck.rules b/packages/sysutils/util-linux/udev.d/10-fsck.rules similarity index 93% rename from packages/sysutils/e2fsprogs/udev.d/10-fsck.rules rename to packages/sysutils/util-linux/udev.d/10-fsck.rules index 7077d860e8..285fd8ad96 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 -V -a -t !ntfs,!xfs,!vfat /dev/%k" # exit LABEL="end" From 98b1a9ba60307db9509eb17c3791da5923d538aa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:06:48 +0200 Subject: [PATCH 09/15] udisks: dont check filesystems in automount script Signed-off-by: Stephan Raue --- packages/sysutils/udisks/init.d/31_mount-disks | 1 - 1 file changed, 1 deletion(-) 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 From 745d4e5d9b636f08cf2c788c49c84e5f2e0d18ed Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:07:23 +0200 Subject: [PATCH 10/15] busybox-initramfs: change fsck command syntax to util-linux's fsck Signed-off-by: Stephan Raue --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 68dc46cb15..da0ed9520d 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -97,7 +97,7 @@ REBOOT="0" progress "trying to mount $1 ..." progress "check filesystem $1 ..." - /sbin/fsck -y $1 > /dev/null 2>&1 + /sbin/fsck -M -V -a -t !ntfs,!xfs,!vfat $1 > /dev/null 2>&1 for i in 1 2 3 4 5 6 7 8 9 10; do ERR_ENV=1 From 83583f3d06dc65a26b606cefa2fa1e143b2dcc23 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:07:50 +0200 Subject: [PATCH 11/15] e2fsprogs: dont build fsck applet Signed-off-by: Stephan Raue --- packages/sysutils/e2fsprogs/build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 - From 499ee9cfeee01bf61415e90f95a0d014fe7c0510 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 14:08:46 +0200 Subject: [PATCH 12/15] ntfs-3g_ntfsprogs: enable mtab, uuid and crypto support Signed-off-by: Stephan Raue --- packages/sysutils/ntfs-3g_ntfsprogs/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From aa1e756081ae7f046e178c0c627a7c757fa15183 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 19:16:36 +0200 Subject: [PATCH 13/15] busybox-initramfs: simplyfing fsck command, cleanups Signed-off-by: Stephan Raue --- .../sysutils/busybox-initramfs/scripts/init | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index da0ed9520d..127fb8348a 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -94,19 +94,17 @@ REBOOT="0" } 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 ..." - /sbin/fsck -M -V -a -t !ntfs,!xfs,!vfat $1 > /dev/null 2>&1 - - for i in 1 2 3 4 5 6 7 8 9 10; do - ERR_ENV=1 - progress "mount filesystem $1 ..." - /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1 - [ "$?" -eq "0" ] && ERR_ENV=0 && break - /bin/busybox usleep 1000000 - done - [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell + for i in 1 2 3 4 5 6 7 8 9 10; do + ERR_ENV=1 + progress "mount filesystem $1 ..." + /bin/busybox mount -o $3 $1 $2 > /dev/null 2>&1 + [ "$?" -eq "0" ] && ERR_ENV=0 && break + /bin/busybox usleep 1000000 + done + [ "$ERR_ENV" -ne "0" ] && error "INIT_4" "Could not mount $1" && debug_shell } update() { From 24ebf0736acb8fe3bafc4e960974eeaa8cff5b14 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 19:17:35 +0200 Subject: [PATCH 14/15] util-linux: simplyfing fsck command Signed-off-by: Stephan Raue --- packages/sysutils/util-linux/udev.d/10-fsck.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/util-linux/udev.d/10-fsck.rules b/packages/sysutils/util-linux/udev.d/10-fsck.rules index 285fd8ad96..9ffbafe59a 100644 --- a/packages/sysutils/util-linux/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 -M -V -a -t !ntfs,!xfs,!vfat /dev/%k" +ACTION=="add|change", RUN+="/sbin/fsck -M -T -a /dev/%k" # exit LABEL="end" From 4f000f4ad5be887f6d6a701d8e80477345cba14b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 5 Jun 2011 19:18:10 +0200 Subject: [PATCH 15/15] libdrm: update to libdrm-2.4.26 Signed-off-by: Stephan Raue --- packages/graphics/libdrm/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"