summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-03-15 22:42:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-19 14:19:07 +0000
commit2c1047310970d3074f15fd20c8ccd58ba916a52f (patch)
tree3b64ea6ebdfaaa712829cf29d70b901bb496bb15 /meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
parentac4ff568f5b2ad4f50a1b7b60797e7b797c314bb (diff)
downloadpoky-2c1047310970d3074f15fd20c8ccd58ba916a52f.tar.gz
Upgrade to systemd 211+
Fixes [YOCTO #5940] Fix checks for %ms format to be a link time check runtime checks wont work in cross compiling Add a patch to workaround missing _SC_PHYS_PAGES in uclibc (From OE-Core rev: 0f5256d4ae5ed88c62e737e3c31587d7635b5dd6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
index 1d4f2732c4..7170a38af3 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
@@ -1,11 +1,11 @@
1Upstream-Status: Denied [no desire for uclibc support] 1Upstream-Status: Denied [no desire for uclibc support]
2Signed-off-by: Khem Raj <raj.khem@gmail.com> 2Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 3
4Index: git/src/nspawn/nspawn.c 4Index: systemd-209/src/nspawn/nspawn.c
5=================================================================== 5===================================================================
6--- git.orig/src/nspawn/nspawn.c 2012-09-22 17:57:05.000000000 -0700 6--- systemd-209.orig/src/nspawn/nspawn.c 2014-02-19 15:03:09.000000000 -0800
7+++ git/src/nspawn/nspawn.c 2012-09-22 18:01:41.541405768 -0700 7+++ systemd-209/src/nspawn/nspawn.c 2014-02-19 23:20:38.720628627 -0800
8@@ -63,6 +63,8 @@ 8@@ -91,6 +91,8 @@
9 LINK_GUEST 9 LINK_GUEST
10 } LinkJournal; 10 } LinkJournal;
11 11
@@ -13,17 +13,17 @@ Index: git/src/nspawn/nspawn.c
13+ 13+
14 static char *arg_directory = NULL; 14 static char *arg_directory = NULL;
15 static char *arg_user = NULL; 15 static char *arg_user = NULL;
16 static char **arg_controllers = NULL; 16 static sd_id128_t arg_uuid = {};
17@@ -1373,7 +1375,12 @@ 17@@ -2045,7 +2047,12 @@
18 a[0] = (char*) "/sbin/init"; 18 a[0] = (char*) "/sbin/init";
19 execve(a[0], a, (char**) envp); 19 execve(a[0], a, env_use);
20 } else if (argc > optind) 20 } else if (argc > optind)
21+#ifdef HAVE_EXECVPE 21+#ifdef HAVE_EXECVPE
22 execvpe(argv[optind], argv + optind, (char**) envp); 22 execvpe(argv[optind], argv + optind, env_use);
23+#else 23+#else
24+ environ = (char **)envp; 24+ environ = env_use;
25+ execvp(argv[optind], argv + optind); 25+ execvp(argv[optind], argv + optind);
26+#endif /* HAVE_EXECVPE */ 26+#endif /* HAVE_EXECVPE */
27 else { 27 else {
28 chdir(home ? home : "/root"); 28 chdir(home ? home : "/root");
29 execle("/bin/bash", "-bash", NULL, (char**) envp); 29 execle("/bin/bash", "-bash", NULL, env_use);