btrfs-progs: fix libattr linking and dependency

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index ca7bbc061c6046284e3c43a149ce66fac96d1c39..2ea81a1b4c750bfef914dad5408af2de68b83621 100644 (file)
--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -29,7 +29,7 @@ define Package/btrfs-progs
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=Filesystem
-  DEPENDS:=+attr +libuuid +zlib +libext2fs +libblkid +liblzo +libpthread
+  DEPENDS:=+libattr +libuuid +zlib +libext2fs +libblkid +liblzo +libpthread
   TITLE:=Btrfs filesystems utilities
   URL:=http://btrfs.wiki.kernel.org/
 endef

diff --git a/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch b/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
index 68bbbfc7faa97fce8d45c04febb422ade2122b89..0e3216952bd426cdfc78525243e0d25f9157a5e5 100644 (file)
--- a/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
+++ b/utils/btrfs-progs/patches/001-fix-xattr-h-include-location.patch
@@ -42,3 +42,14 @@
  
  #include "ctree.h"
  #include "disk-io.h"
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ TESTS = fsck-tests.sh convert-tests.sh
+ INSTALL = install
+ prefix ?= /usr/local
+ bindir = $(prefix)/bin
+-lib_LIBS = -luuid -lblkid -lm -lz -llzo2 -L.
++lib_LIBS = -lattr -luuid -lblkid -lm -lz -llzo2 -L.
+ libdir ?= $(prefix)/lib
+ incdir = $(prefix)/include/btrfs
+ LIBS = $(lib_LIBS) $(libs_static)