summaryrefslogtreecommitdiffstats
path: root/package/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'package/util-linux')
-rw-r--r--package/util-linux/0007-build-sys-fix-typo.patch34
-rw-r--r--package/util-linux/Config.in6
-rw-r--r--package/util-linux/util-linux.mk1
3 files changed, 41 insertions, 0 deletions
diff --git a/package/util-linux/0007-build-sys-fix-typo.patch b/package/util-linux/0007-build-sys-fix-typo.patch
new file mode 100644
index 0000000000..204c3d8f09
--- /dev/null
+++ b/package/util-linux/0007-build-sys-fix-typo.patch
@@ -0,0 +1,34 @@
+From dea1bd2917ed9490ee96162288e0904e3de9da2d Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Tue, 16 Feb 2016 00:24:30 +0100
+Subject: [PATCH] build-sys: fix typo
+
+When timer_create is available have_timer must be
+set to "yes". But instead have_time is used.
+
+Replace have_time by have_timer.
+
+Fixes:
+http://autobuild.buildroot.net/results/993/9935cd0522d4f978ba2e788a690f66790686b76b
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4559573..3950f0c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -390,7 +390,7 @@ AC_CHECK_FUNCS([clock_gettime], [],
+
+ have_timer="no"
+ AC_CHECK_FUNCS([timer_create],
+- [have_time="yes"],
++ [have_timer="yes"],
+ [AC_CHECK_LIB([rt], [timer_create], [
+ have_timer="yes"
+ REALTIME_LIBS="-lrt"
+--
+2.5.0
+
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index ea2311511b..530ad95f52 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -27,6 +27,7 @@ config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
config BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
bool "libsmartcols"
+ depends on BR2_USE_MMU # fork
help
Install libsmartcols.
@@ -91,6 +92,11 @@ config BR2_PACKAGE_UTIL_LINUX_FDFORMAT
help
Low-level format a floppy disk
+config BR2_PACKAGE_UTIL_LINUX_FINDFS
+ bool "findfs"
+ help
+ Find a filesystem by label or UUID
+
config BR2_PACKAGE_UTIL_LINUX_FSCK
bool "fsck"
help
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index cf9505c8de..141dffdcd0 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -73,6 +73,7 @@ UTIL_LINUX_CONF_OPTS += \
$(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \
$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
$(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_FINDFS),--enable-findfs,--disable-findfs) \
$(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
$(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \
$(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
OpenPOWER on IntegriCloud