aboutsummaryrefslogtreecommitdiff
path: root/package/util-linux
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-04-29 10:22:54 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-04-29 23:10:45 +0200
commit5d2724a6cbf8ffdcbfc4dddb4c720a675901f0a9 (patch)
tree0659692c200a0688548aaa8d1872dd8bc9260bd3 /package/util-linux
parent056d25098fb73505a8c173e52de3fafa070bab44 (diff)
downloadbuildroot-5d2724a6cbf8ffdcbfc4dddb4c720a675901f0a9.tar.gz
buildroot-5d2724a6cbf8ffdcbfc4dddb4c720a675901f0a9.tar.bz2
util-linux: bump to version 2.24.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/util-linux')
-rw-r--r--package/util-linux/util-linux-003-c.h-define-mkostemp-for-older-version-of-uClibc.patch (renamed from package/util-linux/util-linux-004-c.h-define-mkostemp-for-older-version-of-uClibc.patch)0
-rw-r--r--package/util-linux/util-linux-003-unshare-include-libmount.h.patch44
-rw-r--r--package/util-linux/util-linux.mk2
3 files changed, 1 insertions, 45 deletions
diff --git a/package/util-linux/util-linux-004-c.h-define-mkostemp-for-older-version-of-uClibc.patch b/package/util-linux/util-linux-003-c.h-define-mkostemp-for-older-version-of-uClibc.patch
index 0dfe7befba..0dfe7befba 100644
--- a/package/util-linux/util-linux-004-c.h-define-mkostemp-for-older-version-of-uClibc.patch
+++ b/package/util-linux/util-linux-003-c.h-define-mkostemp-for-older-version-of-uClibc.patch
diff --git a/package/util-linux/util-linux-003-unshare-include-libmount.h.patch b/package/util-linux/util-linux-003-unshare-include-libmount.h.patch
deleted file mode 100644
index 5ccfe7d1df..0000000000
--- a/package/util-linux/util-linux-003-unshare-include-libmount.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d754315c54af9cb8222e0a04ed5b2b4b927ed176 Mon Sep 17 00:00:00 2001
-From: Ruediger Meier <ruediger.meier@ga-group.nl>
-Date: Mon, 17 Mar 2014 11:48:47 +0100
-Subject: [PATCH 1/1] unshare: include libmount.h to provide missing MS_*
- defines
-
-Since 6728ca10 we are using MS_PRIVATE and MS_REC which are not defined
-in some systems's sys/mount.h.
-
-Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
----
- sys-utils/Makemodule.am | 1 +
- sys-utils/unshare.c | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
-index 30b5d3e..93a2c8d 100644
---- a/sys-utils/Makemodule.am
-+++ b/sys-utils/Makemodule.am
-@@ -296,6 +296,7 @@ usrbin_exec_PROGRAMS += unshare
- dist_man_MANS += sys-utils/unshare.1
- unshare_SOURCES = sys-utils/unshare.c
- unshare_LDADD = $(LDADD) libcommon.la
-+unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
- endif
-
- if BUILD_NSENTER
-diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
-index 91e0ec7..1240293 100644
---- a/sys-utils/unshare.c
-+++ b/sys-utils/unshare.c
-@@ -27,6 +27,9 @@
- #include <sys/wait.h>
- #include <sys/mount.h>
-
-+/* we only need some defines missing in sys/mount.h, no libmount linkage */
-+#include <libmount.h>
-+
- #include "nls.h"
- #include "c.h"
- #include "closestream.h"
---
-1.9.0
-
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 4b8f731ff3..811d8ac7c4 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
UTIL_LINUX_VERSION_MAJOR = 2.24
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)