summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2019-02-05 16:24:46 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-07 14:04:53 +0100
commit4f52e4fd9dae438a1b944cdb037027a3d8221d99 (patch)
tree42fae1eb2400dbb82a594aed1ab1196fdf8b1ae7
parent265827272489a2c845632f889d7bd3f238b8e02e (diff)
downloadptxdist-4f52e4fd9dae438a1b944cdb037027a3d8221d99.tar.gz
ptxdist-4f52e4fd9dae438a1b944cdb037027a3d8221d99.tar.xz
host-e2fsprogs: do not build and use private libuuid/libblkid
util-linux-ng provides more recent versions of libuuid and libblkid. Use them. This prevents outdated versions (and their headers) from getting installed into the sysroot, possibly over the recent versions from host-util-linux-ng. Signed-off-by: Bastian Krause <bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-e2fsprogs.in1
-rw-r--r--rules/host-e2fsprogs.make4
2 files changed, 3 insertions, 2 deletions
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index cc2d7ea64..122b0ba31 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -2,6 +2,7 @@
config HOST_E2FSPROGS
tristate
+ select HOST_UTIL_LINUX_NG
default y if ALLYES
help
Useful hosttools for management of ext2 and ext3 filesystems
diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make
index 2d586fcf6..f382fd2d6 100644
--- a/rules/host-e2fsprogs.make
+++ b/rules/host-e2fsprogs.make
@@ -36,8 +36,8 @@ HOST_E2FSPROGS_CONF_OPT := \
--disable-jbd-debug \
--disable-blkid-debug \
--disable-testio-debug \
- --enable-libuuid \
- --enable-libblkid \
+ --disable-libuuid \
+ --disable-libblkid \
--disable-backtrace \
--disable-debugfs \
--disable-imager \