diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
| commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
| tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/util-linux | |
| parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
| parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
| download | buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch | 50 | ||||
| -rw-r--r-- | package/util-linux/Config.in | 5 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 1 |
3 files changed, 6 insertions, 50 deletions
diff --git a/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch b/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch deleted file mode 100644 index 0dfe7befba..0000000000 --- a/package/util-linux/0003-c.h-define-mkostemp-for-older-version-of-uClibc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42a84250fc78bae3e885ecd1379e713663fe6487 Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@openwide.fr> -Date: Sun, 6 Apr 2014 12:12:41 +0200 -Subject: [PATCH 1/1] c.h: define mkostemp for older version of uClibc - -Signed-off-by: Romain Naour <romain.naour@openwide.fr> ---- - configure.ac | 2 ++ - include/c.h | 14 ++++++++++++++ - 2 files changed, 16 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 35a1f26..a9b8d34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -321,6 +321,8 @@ AC_CHECK_FUNCS([ \ - ]) - AC_FUNC_FSEEKO - -+AC_CHECK_FUNCS([mkostemp]) -+ - AC_CHECK_FUNCS([openat fstatat unlinkat], [have_openat=yes], [have_openat=no]) - AC_CHECK_FUNCS([ioperm iopl], [have_io=yes]) - -diff --git a/include/c.h b/include/c.h -index 4a9bf3d..1b880ed 100644 ---- a/include/c.h -+++ b/include/c.h -@@ -300,4 +300,18 @@ static inline int usleep(useconds_t usec) - # define SEEK_HOLE 4 - #endif - -+/* -+ * mkostemp() may be missing with older version of uClibc -+ */ -+#ifndef HAVE_MKOSTEMP -+static inline int mkostemp(char *template, int flags) -+{ -+ int fd; -+ fd = mkstemp(template); -+ if (flags & O_CLOEXEC && fd >= 0) -+ fcntl(fd, F_SETFD, FD_CLOEXEC); -+ return fd; -+} -+#endif -+ - #endif /* UTIL_LINUX_C_H */ --- -1.9.0 - diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 60abd67ad0..530ad95f52 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -140,6 +140,11 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP help Set up and control loop devices +config BR2_PACKAGE_UTIL_LINUX_LSBLK + bool "lsblk" + help + List block devices. + config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" help diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 7342174289..141dffdcd0 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -85,6 +85,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSBLK),--enable-lsblk,--disable-lsblk) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ |
