mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-12 06:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: Upgrade to 2.27.1

Browse Source 
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
2015-12-12 19:38:39 +00:00
committed by Richard Purdie
parent bdbc5eef3a
commit c529e661d0
4 changed files with 4 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
View File

@@ -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

32
meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
View File

@@ -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";
]])], [

33
meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
View File

@@ -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