util-linux: Upgrade to 2.27.1
Patches that are dropped are already available upstream in 2.27 release (From OE-Core rev: e4b9c8efaff3b869e2944444b16078ec19dce3ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
Richard Purdie
parent
bdbc5eef3a
commit
c529e661d0
|
|
@ -1,35 +0,0 @@
|
|||
From 774f55f9dd22c01e4041a183d8dff14811f29114 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Fri, 4 Apr 2014 17:33:04 +0800
|
||||
Subject: [PATCH] sys-utils/Makemodule.am: fix parallel build issue
|
||||
|
||||
The rule SETARCH_MAN_LINKS is used for the files under the sys-utils
|
||||
dir, for example:
|
||||
|
||||
echo ".so man8/setarch.8" > sys-utils/linux32.8
|
||||
|
||||
but it depends on nothing so that the sys-utils dir may not exist, we
|
||||
can create the sys-utils dir to fix problem.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
sys-utils/Makemodule.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
|
||||
index 6265282..62ead37 100644
|
||||
--- a/sys-utils/Makemodule.am
|
||||
+++ b/sys-utils/Makemodule.am
|
||||
@@ -124,6 +124,7 @@ man_MANS += $(SETARCH_MAN_LINKS)
|
||||
CLEANFILES += $(SETARCH_MAN_LINKS)
|
||||
|
||||
$(SETARCH_MAN_LINKS):
|
||||
+ $(MKDIR_P) sys-utils
|
||||
$(AM_V_GEN)echo ".so man8/setarch.8" > $@
|
||||
|
||||
install-exec-hook-setarch:
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
configure should include errno.h instead of argp.h when
|
||||
checking for presence of program_invocation_short_name
|
||||
uclibc defines this to be const char* unlike util-linux-ng
|
||||
which defines this to be char* so this error goes unnoticed
|
||||
on glibc/eglibc systems.
|
||||
|
||||
here is the error it fixes
|
||||
|
||||
in file included from mountP.h:14:0,
|
||||
from cache.c:29:
|
||||
/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname'
|
||||
../../../include/c.h:118:14: note: previous declaration of '__progname' was here
|
||||
make[3]: *** [cache.lo] Error 1
|
||||
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
Index: util-linux-2.22.1/configure.ac
|
||||
===================================================================
|
||||
--- util-linux-2.22.1.orig/configure.ac
|
||||
+++ util-linux-2.22.1/configure.ac
|
||||
@@ -372,7 +372,7 @@ esac
|
||||
|
||||
AC_MSG_CHECKING([whether program_invocation_short_name is defined])
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
- #include <argp.h>
|
||||
+ #include <errno.h>
|
||||
]], [[
|
||||
program_invocation_short_name = "test";
|
||||
]])], [
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
login-utils/login.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/login-utils/login.c b/login-utils/login.c
|
||||
index ebb76f5..38c881b 100644
|
||||
--- a/login-utils/login.c
|
||||
+++ b/login-utils/login.c
|
||||
@@ -1110,6 +1110,7 @@ int main(int argc, char **argv)
|
||||
char *buff;
|
||||
int childArgc = 0;
|
||||
int retcode;
|
||||
+ struct sigaction act;
|
||||
|
||||
char *pwdbuf = NULL;
|
||||
struct passwd *pwd = NULL, _pwd;
|
||||
@@ -1123,7 +1124,9 @@ int main(int argc, char **argv)
|
||||
timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
|
||||
|
||||
signal(SIGALRM, timedout);
|
||||
- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */
|
||||
+ (void) sigaction(SIGALRM, NULL, &act);
|
||||
+ act.sa_flags &= ~SA_RESTART;
|
||||
+ sigaction(SIGALRM, &act, NULL);
|
||||
alarm(timeout);
|
||||
signal(SIGQUIT, SIG_IGN);
|
||||
signal(SIGINT, SIG_IGN);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
MAJOR_VERSION = "2.26"
|
||||
MAJOR_VERSION = "2.27"
|
||||
require util-linux.inc
|
||||
|
||||
# To support older hosts, we need to patch and/or revert
|
||||
|
|
@ -8,11 +8,8 @@ OLDHOST_class-native = "file://util-linux-native.patch \
|
|||
file://util-linux-native-qsort.patch \
|
||||
"
|
||||
|
||||
SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
|
||||
file://util-linux-ng-2.16-mount_lock_path.patch \
|
||||
file://uclibc-__progname-conflict.patch \
|
||||
SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
|
||||
file://configure-sbindir.patch \
|
||||
file://fix-parallel-build.patch \
|
||||
file://runuser.pamd \
|
||||
file://runuser-l.pamd \
|
||||
${OLDHOST} \
|
||||
|
|
@ -23,8 +20,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
|
|||
file://display_testname_for_subtest.patch \
|
||||
file://avoid_parallel_tests.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb"
|
||||
SRC_URI[sha256sum] = "0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666"
|
||||
SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
|
||||
SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"
|
||||
|
||||
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
|
||||
|
||||
Loading…
Reference in New Issue