summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch35
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch32
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch33
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.27.1.bb (renamed from meta/recipes-core/util-linux/util-linux_2.26.2.bb)11
4 files changed, 4 insertions, 107 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch b/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
deleted file mode 100644
index adb271ce0d..0000000000
--- a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 774f55f9dd22c01e4041a183d8dff14811f29114 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 4 Apr 2014 17:33:04 +0800
4Subject: [PATCH] sys-utils/Makemodule.am: fix parallel build issue
5
6The rule SETARCH_MAN_LINKS is used for the files under the sys-utils
7dir, for example:
8
9echo ".so man8/setarch.8" > sys-utils/linux32.8
10
11but it depends on nothing so that the sys-utils dir may not exist, we
12can create the sys-utils dir to fix problem.
13
14Upstream-Status: Pending
15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17---
18 sys-utils/Makemodule.am | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
22index 6265282..62ead37 100644
23--- a/sys-utils/Makemodule.am
24+++ b/sys-utils/Makemodule.am
25@@ -124,6 +124,7 @@ man_MANS += $(SETARCH_MAN_LINKS)
26 CLEANFILES += $(SETARCH_MAN_LINKS)
27
28 $(SETARCH_MAN_LINKS):
29+ $(MKDIR_P) sys-utils
30 $(AM_V_GEN)echo ".so man8/setarch.8" > $@
31
32 install-exec-hook-setarch:
33--
341.8.2.1
35
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
deleted file mode 100644
index 5031a7313e..0000000000
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1configure should include errno.h instead of argp.h when
2checking for presence of program_invocation_short_name
3uclibc defines this to be const char* unlike util-linux-ng
4which defines this to be char* so this error goes unnoticed
5on glibc/eglibc systems.
6
7here is the error it fixes
8
9in file included from mountP.h:14:0,
10 from cache.c:29:
11/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname'
12../../../include/c.h:118:14: note: previous declaration of '__progname' was here
13make[3]: *** [cache.lo] Error 1
14
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Jonathan Liu <net147@gmail.com>
18
19Upstream-Status: Pending
20Index: util-linux-2.22.1/configure.ac
21===================================================================
22--- util-linux-2.22.1.orig/configure.ac
23+++ util-linux-2.22.1/configure.ac
24@@ -372,7 +372,7 @@ esac
25
26 AC_MSG_CHECKING([whether program_invocation_short_name is defined])
27 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
28- #include <argp.h>
29+ #include <errno.h>
30 ]], [[
31 program_invocation_short_name = "test";
32 ]])], [
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index 6717a75a90..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
4---
5 login-utils/login.c | 5 ++++-
6 1 file changed, 4 insertions(+), 1 deletion(-)
7
8diff --git a/login-utils/login.c b/login-utils/login.c
9index ebb76f5..38c881b 100644
10--- a/login-utils/login.c
11+++ b/login-utils/login.c
12@@ -1110,6 +1110,7 @@ int main(int argc, char **argv)
13 char *buff;
14 int childArgc = 0;
15 int retcode;
16+ struct sigaction act;
17
18 char *pwdbuf = NULL;
19 struct passwd *pwd = NULL, _pwd;
20@@ -1123,7 +1124,9 @@ int main(int argc, char **argv)
21 timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
22
23 signal(SIGALRM, timedout);
24- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */
25+ (void) sigaction(SIGALRM, NULL, &act);
26+ act.sa_flags &= ~SA_RESTART;
27+ sigaction(SIGALRM, &act, NULL);
28 alarm(timeout);
29 signal(SIGQUIT, SIG_IGN);
30 signal(SIGINT, SIG_IGN);
31--
321.9.1
33
diff --git a/meta/recipes-core/util-linux/util-linux_2.26.2.bb b/meta/recipes-core/util-linux/util-linux_2.27.1.bb
index 02e42c1c08..14a77ca4b2 100644
--- a/meta/recipes-core/util-linux/util-linux_2.26.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.27.1.bb
@@ -1,4 +1,4 @@
1MAJOR_VERSION = "2.26" 1MAJOR_VERSION = "2.27"
2require util-linux.inc 2require util-linux.inc
3 3
4# To support older hosts, we need to patch and/or revert 4# To support older hosts, we need to patch and/or revert
@@ -8,11 +8,8 @@ OLDHOST_class-native = "file://util-linux-native.patch \
8 file://util-linux-native-qsort.patch \ 8 file://util-linux-native-qsort.patch \
9 " 9 "
10 10
11SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 11SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
12 file://util-linux-ng-2.16-mount_lock_path.patch \
13 file://uclibc-__progname-conflict.patch \
14 file://configure-sbindir.patch \ 12 file://configure-sbindir.patch \
15 file://fix-parallel-build.patch \
16 file://runuser.pamd \ 13 file://runuser.pamd \
17 file://runuser-l.pamd \ 14 file://runuser-l.pamd \
18 ${OLDHOST} \ 15 ${OLDHOST} \
@@ -23,8 +20,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
23 file://display_testname_for_subtest.patch \ 20 file://display_testname_for_subtest.patch \
24 file://avoid_parallel_tests.patch \ 21 file://avoid_parallel_tests.patch \
25" 22"
26SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb" 23SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
27SRC_URI[sha256sum] = "0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666" 24SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"
28 25
29CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" 26CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
30 27