aboutsummaryrefslogtreecommitdiff
path: root/package/e2fsprogs
diff options
context:
space:
mode:
authorGravatar Carlos Santos <casantos@datacom.ind.br>2017-04-22 13:59:48 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-22 14:30:30 +0200
commitaab5db994c5c520a6d990a560737c61d36205698 (patch)
tree1aaf335470587cbfa87e44a41f6e012ac66cdf60 /package/e2fsprogs
parenta48d94b7fc873bd7084b7ef09fb738c8df1086b5 (diff)
downloadbuildroot-aab5db994c5c520a6d990a560737c61d36205698.tar.gz
buildroot-aab5db994c5c520a6d990a560737c61d36205698.tar.bz2
e2fsprogs: use libblkid and libuuid from util-linux for host
We have a host-util-linux, so we can use it to provide libblkid and libuuid. This makes it consistent with the target package. Signed-off-by: Carlos Santos <casantos@datacom.ind.br> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Config.in.host1
-rw-r--r--package/e2fsprogs/e2fsprogs.mk13
2 files changed, 11 insertions, 3 deletions
diff --git a/package/e2fsprogs/Config.in.host b/package/e2fsprogs/Config.in.host
index de9148e31d..7591bbcb7e 100644
--- a/package/e2fsprogs/Config.in.host
+++ b/package/e2fsprogs/Config.in.host
@@ -1,5 +1,6 @@
config BR2_PACKAGE_HOST_E2FSPROGS
bool "host e2fsprogs"
+ select BR2_PACKAGE_HOST_UTIL_LINUX
help
The EXT2/3/4 file system utilities.
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 896f01414d..5231a97f9c 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -10,14 +10,21 @@ E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2F
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES
+
+# Use libblkid and libuuid from util-linux for host and target packages.
+# This prevents overriding them with e2fsprogs' ones, which may cause
+# problems for other packages.
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
-# we don't have a host-util-linux
-HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
+HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
# need it on the host anyway.
# Disable fuse2fs as well to avoid carrying over deps, and it's unused
-HOST_E2FSPROGS_CONF_OPTS += --disable-defrag --disable-fuse2fs
+HOST_E2FSPROGS_CONF_OPTS = \
+ --disable-defrag \
+ --disable-fuse2fs \
+ --disable-libblkid \
+ --disable-libuuid
E2FSPROGS_CONF_OPTS = \
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \