diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-28 17:58:50 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-28 17:58:50 +0200 |
| commit | e1ffc2f791b336339909c90559b7db40b455f172 (patch) | |
| tree | abbc917d94e559a7c4882ee2d6c99d19780972e0 /package/e2fsprogs/Config.in | |
| parent | 43d198c051556f66ec3bb6226415dce822e7a0c4 (diff) | |
| download | buildroot-novena-e1ffc2f791b336339909c90559b7db40b455f172.tar.gz buildroot-novena-e1ffc2f791b336339909c90559b7db40b455f172.zip | |
e2fsprogs: use libblkid / blkid from util-linux
e2fsprogs and util-linux both provide blkid / libblkid causing conflicts
if both are enabled. The preferred upstream (E.G. what is used by Debian)
is util-linux, so remove the options from e2fsprogs and make it use the
util-linux version instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/e2fsprogs/Config.in')
| -rw-r--r-- | package/e2fsprogs/Config.in | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index 2410fef99..76586d239 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -2,6 +2,10 @@ config BR2_PACKAGE_E2FSPROGS bool "e2fsprogs" depends on BR2_LARGEFILE + 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_LIBBLKID help The EXT2 file system utilities and libraries @@ -17,11 +21,6 @@ config BR2_PACKAGE_E2FSPROGS_BADBLOCKS bool "badblocks" default y -config BR2_PACKAGE_E2FSPROGS_BLKID - bool "blkid" - default y - select BR2_PACKAGE_E2FSPROGS_LIBBLKID - config BR2_PACKAGE_E2FSPROGS_CHATTR bool "chattr" default y @@ -41,7 +40,6 @@ config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG config BR2_PACKAGE_E2FSPROGS_E2FSCK bool "e2fsck" default y - select BR2_PACKAGE_E2FSPROGS_LIBBLKID config BR2_PACKAGE_E2FSPROGS_E2IMAGE bool "e2image" @@ -49,7 +47,6 @@ config BR2_PACKAGE_E2FSPROGS_E2IMAGE config BR2_PACKAGE_E2FSPROGS_E2LABEL bool "e2label" default y - select BR2_PACKAGE_E2FSPROGS_LIBBLKID config BR2_PACKAGE_E2FSPROGS_E2UNDO bool "e2undo" @@ -67,7 +64,6 @@ config BR2_PACKAGE_E2FSPROGS_FINDFS config BR2_PACKAGE_E2FSPROGS_FSCK bool "fsck" default y - select BR2_PACKAGE_E2FSPROGS_LIBBLKID config BR2_PACKAGE_E2FSPROGS_LOGSAVE bool "logsave" @@ -80,7 +76,6 @@ config BR2_PACKAGE_E2FSPROGS_LSATTR config BR2_PACKAGE_E2FSPROGS_MKE2FS bool "mke2fs" default y - select BR2_PACKAGE_E2FSPROGS_LIBBLKID config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND bool "mklost+found" @@ -117,14 +112,8 @@ config BR2_PACKAGE_E2FSPROGS_LIBUUID help The uuid library from the e2fsprogs suite -config BR2_PACKAGE_E2FSPROGS_LIBBLKID - bool "libblkid" - select BR2_PACKAGE_E2FSPROGS_LIBUUID - help - The blkid library from the e2fsprogs suite - endmenu -comment "e2fsprogs requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) |