summaryrefslogtreecommitdiff
path: root/package/xfsprogs
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-07-29 08:49:48 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-07-29 08:49:48 +0200
commite1fbd63f3c9700ef9d590ea7b4659ca592db5e3c (patch)
tree7b86200292e106ac9ac8b5d9ca363304b263fe45 /package/xfsprogs
parent7ee8ebbd813ad0a6d2392ef628c1724104f0619b (diff)
package: use libuuid from util-linux
And adjust users. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/xfsprogs')
-rw-r--r--package/xfsprogs/Config.in10
-rw-r--r--package/xfsprogs/xfsprogs.mk2
2 files changed, 7 insertions, 5 deletions
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index 12bc69e1e..6c4d547dc 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -2,14 +2,16 @@
comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled"
depends on BR2_PACKAGE_XFSPROGS
-comment "xfsprogs requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+comment "xfsprogs requires a toolchain with LARGEFILE + WCHAR support"
+ depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
config BR2_PACKAGE_XFSPROGS
bool "xfsprogs"
depends on BR2_LARGEFILE
- select BR2_PACKAGE_E2FSPROGS
- select BR2_PACKAGE_E2FSPROGS_LIBUUID
+ depends on BR2_USE_WCHAR # util-linux
+ select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # util-linux
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
The XFS file system utilities and libraries
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
index 866e9b295..204b3cbd6 100644
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -77,7 +77,7 @@ $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY): $(XFSPROGS_DIR)/$(XFSPROGS_BINARY)
rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
touch -c $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
-xfsprogs: e2fsprogs $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
+xfsprogs: util-linux $(TARGET_DIR)/$(XFSPROGS_TARGET_BINARY)
xfsprogs-clean:
rm -f $(TARGET_DIR)/bin/xfs_* $(TARGET_DIR)/sbin/xfs_* $(TARGET_DIR)/sbin/*.xfs