diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-01 14:45:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:30 +0000 |
commit | 0203b2b3af5858931fc82072551a264ec4506d52 (patch) | |
tree | 28946aa775299947330f4a02a100738ee7feaa64 /meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch | |
parent | 60a8f94c00101eff39428ff7548f45ffe1233103 (diff) | |
download | poky-0203b2b3af5858931fc82072551a264ec4506d52.tar.gz |
util-linux: Update to 2.20.1
Add patch remove setting CC, LD and LDFLAGS on commandline
since they are passed correctly via configure. Those setting
also caused the configure information about -std=gnu99 from
being passed correctly.
Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check
libuuid removed an API that e2fsprogs uuidd used (uuid__generate_*),
thus we disable it in this patch and will now provide uuidd from
util-linux.
See http://sourceforge.net/projects/e2fsprogs/forums/forum/7053/topic/4639484
(From OE-Core rev: fdaf4e791fcacb48ea430ec768ad9a6919c65ce0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch new file mode 100644 index 0000000000..c5c0affcb8 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: util-linux-ng-2.14/login-utils/login.c | ||
4 | =================================================================== | ||
5 | --- util-linux-ng-2.14.orig/login-utils/login.c 2008-05-28 16:01:02.000000000 -0700 | ||
6 | +++ util-linux-ng-2.14/login-utils/login.c 2009-03-04 18:31:42.000000000 -0800 | ||
7 | @@ -358,6 +358,7 @@ | ||
8 | char *childArgv[10]; | ||
9 | char *buff; | ||
10 | int childArgc = 0; | ||
11 | + struct sigaction act; | ||
12 | #ifdef HAVE_SECURITY_PAM_MISC_H | ||
13 | int retcode; | ||
14 | pam_handle_t *pamh = NULL; | ||
15 | @@ -373,7 +374,9 @@ | ||
16 | pid = getpid(); | ||
17 | |||
18 | signal(SIGALRM, timedout); | ||
19 | - siginterrupt(SIGALRM,1); /* we have to interrupt syscalls like ioclt() */ | ||
20 | + (void) sigaction(SIGALRM, NULL, &act); | ||
21 | + act.sa_flags &= ~SA_RESTART; | ||
22 | + sigaction(SIGALRM, &act, NULL); | ||
23 | alarm((unsigned int)timeout); | ||
24 | signal(SIGQUIT, SIG_IGN); | ||
25 | signal(SIGINT, SIG_IGN); | ||