From 73dcfb6f1068acce0fcf05866c398a82fcba4b66 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 15 Jun 2016 14:25:16 +0800 Subject: util-linux: upgrade to 2.28 Related patches are rebased. util-linux-ng-2.16-mount_lock_path.patch is removed because there's no _PATH_MOUNTED_LOCK in the latest codes. util-linux-native.patch is removed because 2.28 version of util-linux has taken mkostemp into consideration and provide fallback if mkostemp fails. avoid_unsupported_sleep_param.patch is removed and coreutils is added as a runtime dependency to util-linux-ptest to solve the same problem. avoid_unsupported_grep_opts.patch is removed and grep is added as a runtime dependency to util-linux-ptest to solve the sanme problem. (From OE-Core rev: fccf99d9130f3c5ce358c97c97c52cd74deef25c) Signed-off-by: Chen Qi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../util-linux/util-linux/util-linux-native.patch | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-native.patch (limited to 'meta/recipes-core/util-linux/util-linux/util-linux-native.patch') diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native.patch deleted file mode 100644 index 1f496dee21..0000000000 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch +++ /dev/null @@ -1,57 +0,0 @@ -Support older hosts with latest util-linux-native - -mkostemp is not defined on older machines. So we detect this and -provide a define that uses mkstemp instead. - -O_CLOEXEC is not defined on older machines. It is however defined -in the 'c.h' header. Fix up the users to include 'c.h'. - -fdisks/fdisksunlabel.c was modified to use qsort_r, however -this is not defined on older hosts. Revert: - commit c69bbca9c1f6645097bd20fe3a21f5a99a2a0698 - fdisk: (sun): use ask API, remove global variable - -Upstream-Status: Inappropriate [other] -Patches revert upstream changes in order to support older -machines. - -Signed-off-by: Mark Hatle -Signed-off-by: Chen Qi ---- - configure.ac | 1 + - include/c.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index eb3680b..93e015f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -318,6 +318,7 @@ AC_CHECK_FUNCS([ \ - llseek \ - lseek64 \ - mempcpy \ -+ mkostemp \ - nanosleep \ - open_memstream \ - personality \ -diff --git a/include/c.h b/include/c.h -index e423e8b..cf33b94 100644 ---- a/include/c.h -+++ b/include/c.h -@@ -233,6 +233,13 @@ static inline int dirfd(DIR *d) - #endif - - /* -+ * mkostemp replacement -+ */ -+#ifndef HAVE_MKOSTEMP -+#define mkostemp(template, flags) mkstemp(template) -+#endif -+ -+/* - * MAXHOSTNAMELEN replacement - */ - static inline size_t get_hostname_max(void) --- -1.9.1 - -- cgit 1.2.3-korg