summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-22 05:04:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-22 15:56:20 (GMT)
commitb1c7b57a05141d40349ba0c73c29765706edb799 (patch)
tree6a4f1483fcbce5380b99f1c88c6d5a12c5674930
parent74ec9ba5730dabaf3ec3e9e69a694dd57081f7dc (diff)
downloadpoky-b1c7b57a05141d40349ba0c73c29765706edb799.tar.gz
systemd: Fix build on uclibc
Systemd has some uclibc specific patches which needed to be forwarded ported to 196 (From OE-Core rev: e39f01ba4f6d9d9f1d24fd01745530cde9e92131) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch25
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch131
2 files changed, 83 insertions, 73 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
index 533a239..72d1411 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
@@ -7,30 +7,29 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
7 units/serial-getty@.service.m4 | 2 +- 7 units/serial-getty@.service.m4 | 2 +-
8 2 files changed, 2 insertions(+), 2 deletions(-) 8 2 files changed, 2 insertions(+), 2 deletions(-)
9 9
10Index: systemd-37/units/getty@.service.m4 10Index: systemd-196/units/getty@.service.m4
11=================================================================== 11===================================================================
12--- systemd-37.orig/units/getty@.service.m4 12--- systemd-196.orig/units/getty@.service.m4 2012-11-20 12:39:16.000000000 -0800
13+++ systemd-37/units/getty@.service.m4 13+++ systemd-196/units/getty@.service.m4 2013-01-21 16:08:03.707533381 -0800
14@@ -41,7 +41,7 @@ 14@@ -45,7 +45,7 @@
15 15
16 [Service] 16 [Service]
17 Environment=TERM=linux
18 # the VT is cleared by TTYVTDisallocate 17 # the VT is cleared by TTYVTDisallocate
19-ExecStart=-/sbin/agetty --noclear %I 38400 18-ExecStart=-/sbin/agetty --noclear %I 38400 linux
20+ExecStart=-/sbin/getty -L %I 115200 linux 19+ExecStart=-/sbin/getty -L %I 115200 linux
21 Type=idle 20 Type=idle
22 Restart=always 21 Restart=always
23 RestartSec=0 22 RestartSec=0
24Index: systemd-37/units/serial-getty@.service.m4 23Index: systemd-196/units/serial-getty@.service.m4
25=================================================================== 24===================================================================
26--- systemd-37.orig/units/serial-getty@.service.m4 25--- systemd-196.orig/units/serial-getty@.service.m4 2012-11-20 12:39:16.000000000 -0800
27+++ systemd-37/units/serial-getty@.service.m4 26+++ systemd-196/units/serial-getty@.service.m4 2013-01-21 16:09:01.763535039 -0800
28@@ -37,7 +37,7 @@ 27@@ -40,7 +40,7 @@
28 IgnoreOnIsolate=yes
29 29
30 [Service] 30 [Service]
31 Environment=TERM=vt102 31-ExecStart=-/sbin/agetty -s %I 115200,38400,9600 vt102
32-ExecStart=-/sbin/agetty -s %I 115200,38400,9600 32+ExecStart=-/sbin/getty -L %I 115200 vt102
33+ExecStart=-/sbin/getty -L %I 115200 vt100
34 Type=idle 33 Type=idle
35 Restart=always 34 Restart=always
36 RestartSec=0 35 RestartSec=0
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
index f3b1ace..aa186bd 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
@@ -1,8 +1,10 @@
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
4--- systemd-pam-185/src/fsck/fsck.c.orig 2012-06-22 23:22:22.000000000 -0400 4Index: systemd-196/src/fsck/fsck.c
5+++ systemd-pam-185/src/fsck/fsck.c 2012-06-22 21:15:56.000000000 -0400 5===================================================================
6--- systemd-196.orig/src/fsck/fsck.c 2012-07-26 03:45:14.000000000 -0700
7+++ systemd-196/src/fsck/fsck.c 2013-01-21 16:10:46.807537608 -0800
6@@ -36,6 +36,8 @@ 8@@ -36,6 +36,8 @@
7 #include "bus-errors.h" 9 #include "bus-errors.h"
8 #include "virt.h" 10 #include "virt.h"
@@ -31,67 +33,66 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
31 33
32 /* Only show one progress counter at max */ 34 /* Only show one progress counter at max */
33 if (!locked) { 35 if (!locked) {
34--- systemd-pam-185/src/core/swap.c.orig 2012-06-22 23:22:55.000000000 -0400 36Index: systemd-196/src/core/swap.c
35+++ systemd-pam-185/src/core/swap.c 2012-06-22 21:17:10.000000000 -0400 37===================================================================
36@@ -40,6 +40,8 @@ 38--- systemd-196.orig/src/core/swap.c 2012-10-29 19:40:42.000000000 -0700
37 #include "def.h" 39+++ systemd-196/src/core/swap.c 2013-01-21 16:15:11.751544181 -0800
40@@ -41,6 +41,8 @@
38 #include "path-util.h" 41 #include "path-util.h"
42 #include "virt.h"
39 43
40+#include "config.h" 44+#include "config.h"
41+ 45+
42 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { 46 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
43 [SWAP_DEAD] = UNIT_INACTIVE, 47 [SWAP_DEAD] = UNIT_INACTIVE,
44 [SWAP_ACTIVATING] = UNIT_ACTIVATING, 48 [SWAP_ACTIVATING] = UNIT_ACTIVATING,
45@@ -1038,7 +1040,7 @@ 49@@ -1059,6 +1061,7 @@
46 for (i = 1;; i++) {
47 char *dev = NULL, *d; 50 char *dev = NULL, *d;
48 int prio = 0, k; 51 int prio = 0, k;
49- 52
50+#ifdef HAVE_MSFORMAT 53+#ifdef HAVE_MSFORMAT
51 if ((k = fscanf(m->proc_swaps, 54 k = fscanf(m->proc_swaps,
52 "%ms " /* device/file */ 55 "%ms " /* device/file */
53 "%*s " /* type of swap */ 56 "%*s " /* type of swap */
54@@ -1046,10 +1048,18 @@ 57@@ -1066,6 +1069,16 @@
55 "%*s " /* used */ 58 "%*s " /* used */
56 "%i\n", /* priority */ 59 "%i\n", /* priority */
57 &dev, &prio)) != 2) { 60 &dev, &prio);
58-
59+#else 61+#else
60+ dev = malloc(257); 62+ dev = malloc(257);
61+ if ((k = fscanf(m->proc_swaps, 63+ k = fscanf(m->proc_swaps,
62+ "%256s " /* device/file */ 64+ "%256s "/* device/file */
63+ "%*s " /* type of swap */ 65+ "%*s " /* type of swap */
64+ "%*s " /* swap size */ 66+ "%*s " /* swap size */
65+ "%*s " /* used */ 67+ "%*s " /* used */
66+ "%i\n", /* priority */ 68+ "%i\n", /* priority */
67+ dev, &prio)) != 2) { 69+ dev, &prio);
68+#endif /* HAVE_MSFORMAT */ 70+#endif /* HAVE_MSFORMAT */
71 if (k != 2) {
69 if (k == EOF) 72 if (k == EOF)
70 break; 73 break;
71- 74Index: systemd-196/src/core/mount-setup.c
72 log_warning("Failed to parse /proc/swaps:%u.", i); 75===================================================================
73 free(dev); 76--- systemd-196.orig/src/core/mount-setup.c 2012-11-09 06:55:35.000000000 -0800
74 continue; 77+++ systemd-196/src/core/mount-setup.c 2013-01-21 16:10:46.807537608 -0800
75--- systemd-pam-185/src/core/mount-setup.c.orig 2012-06-22 23:23:41.000000000 -0400
76+++ systemd-pam-185/src/core/mount-setup.c 2012-06-22 21:19:44.000000000 -0400
77@@ -28,6 +28,7 @@ 78@@ -28,6 +28,7 @@
78 #include <assert.h> 79 #include <assert.h>
79 #include <unistd.h> 80 #include <unistd.h>
80 #include <ftw.h> 81 #include <ftw.h>
81+#include <linux/fs.h> 82+#include <linux/fs.h>
82 83
83 #include "mount-setup.h" 84 #include "mount-setup.h"
84 #include "dev-setup.h" 85 #include "dev-setup.h"
85@@ -41,6 +41,8 @@ 86@@ -42,6 +43,8 @@
86 #include "path-util.h"
87 #include "missing.h" 87 #include "missing.h"
88 #include "virt.h"
88 89
89+#include "config.h" 90+#include "config.h"
90+ 91+
91 #ifndef TTY_GID 92 #ifndef TTY_GID
92 #define TTY_GID 5 93 #define TTY_GID 5
93 #endif 94 #endif
94@@ -200,9 +202,12 @@ 95@@ -224,9 +227,12 @@
95 for (;;) { 96 for (;;) {
96 char *controller; 97 char *controller;
97 int enabled = 0; 98 int enabled = 0;
@@ -106,8 +107,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
106 if (feof(f)) 107 if (feof(f))
107 break; 108 break;
108 109
109--- systemd-pam-185/src/core/mount.c.orig 2012-06-22 23:24:17.000000000 -0400 110Index: systemd-196/src/core/mount.c
110+++ systemd-pam-185/src/core/mount.c 2012-06-22 22:51:21.000000000 -0400 111===================================================================
112--- systemd-196.orig/src/core/mount.c 2012-10-22 16:53:02.000000000 -0700
113+++ systemd-196/src/core/mount.c 2013-01-21 16:10:46.811537609 -0800
111@@ -41,6 +41,8 @@ 114@@ -41,6 +41,8 @@
112 #include "exit-status.h" 115 #include "exit-status.h"
113 #include "def.h" 116 #include "def.h"
@@ -117,7 +120,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
117 static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { 120 static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
118 [MOUNT_DEAD] = UNIT_INACTIVE, 121 [MOUNT_DEAD] = UNIT_INACTIVE,
119 [MOUNT_MOUNTING] = UNIT_ACTIVATING, 122 [MOUNT_MOUNTING] = UNIT_ACTIVATING,
120@@ -1514,7 +1516,7 @@ 123@@ -1538,7 +1540,7 @@
121 int k; 124 int k;
122 125
123 device = path = options = options2 = fstype = d = p = o = NULL; 126 device = path = options = options2 = fstype = d = p = o = NULL;
@@ -126,7 +129,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
126 if ((k = fscanf(m->proc_self_mountinfo, 129 if ((k = fscanf(m->proc_self_mountinfo,
127 "%*s " /* (1) mount id */ 130 "%*s " /* (1) mount id */
128 "%*s " /* (2) parent id */ 131 "%*s " /* (2) parent id */
129@@ -1533,7 +1535,31 @@ 132@@ -1557,7 +1559,31 @@
130 &fstype, 133 &fstype,
131 &device, 134 &device,
132 &options2)) != 5) { 135 &options2)) != 5) {
@@ -159,18 +162,20 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
159 if (k == EOF) 162 if (k == EOF)
160 break; 163 break;
161 164
162--- systemd-pam-185/src/core/umount.c.orig 2012-06-22 23:24:37.000000000 -0400 165Index: systemd-196/src/core/umount.c
163+++ systemd-pam-185/src/core/umount.c 2012-06-22 22:56:15.000000000 -0400 166===================================================================
164@@ -35,6 +35,8 @@ 167--- systemd-196.orig/src/core/umount.c 2012-11-16 09:32:41.000000000 -0800
165 #include "path-util.h" 168+++ systemd-196/src/core/umount.c 2013-01-21 16:10:46.811537609 -0800
169@@ -36,6 +36,8 @@
166 #include "util.h" 170 #include "util.h"
171 #include "virt.h"
167 172
168+#include "config.h" 173+#include "config.h"
169+ 174+
170 typedef struct MountPoint { 175 typedef struct MountPoint {
171 char *path; 176 char *path;
172 dev_t devnum; 177 dev_t devnum;
173@@ -74,7 +76,7 @@ 178@@ -75,7 +77,7 @@
174 MountPoint *m; 179 MountPoint *m;
175 180
176 path = p = NULL; 181 path = p = NULL;
@@ -179,7 +184,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
179 if ((k = fscanf(proc_self_mountinfo, 184 if ((k = fscanf(proc_self_mountinfo,
180 "%*s " /* (1) mount id */ 185 "%*s " /* (1) mount id */
181 "%*s " /* (2) parent id */ 186 "%*s " /* (2) parent id */
182@@ -89,6 +91,23 @@ 187@@ -90,6 +92,23 @@
183 "%*s" /* (11) mount options 2 */ 188 "%*s" /* (11) mount options 2 */
184 "%*[^\n]", /* some rubbish at the end */ 189 "%*[^\n]", /* some rubbish at the end */
185 &path)) != 1) { 190 &path)) != 1) {
@@ -203,7 +208,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
203 if (k == EOF) 208 if (k == EOF)
204 break; 209 break;
205 210
206@@ -150,7 +169,7 @@ 211@@ -151,7 +170,7 @@
207 MountPoint *swap; 212 MountPoint *swap;
208 char *dev = NULL, *d; 213 char *dev = NULL, *d;
209 int k; 214 int k;
@@ -212,7 +217,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
212 if ((k = fscanf(proc_swaps, 217 if ((k = fscanf(proc_swaps,
213 "%ms " /* device/file */ 218 "%ms " /* device/file */
214 "%*s " /* type of swap */ 219 "%*s " /* type of swap */
215@@ -158,7 +177,16 @@ 220@@ -159,7 +178,16 @@
216 "%*s " /* used */ 221 "%*s " /* used */
217 "%*s\n", /* priority */ 222 "%*s\n", /* priority */
218 &dev)) != 1) { 223 &dev)) != 1) {
@@ -230,8 +235,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
230 if (k == EOF) 235 if (k == EOF)
231 break; 236 break;
232 237
233--- systemd-pam-185/src/shared/socket-util.c.orig 2012-06-22 23:25:00.000000000 -0400 238Index: systemd-196/src/shared/socket-util.c
234+++ systemd-pam-185/src/shared/socket-util.c 2012-06-22 22:59:27.000000000 -0400 239===================================================================
240--- systemd-196.orig/src/shared/socket-util.c 2012-11-14 13:21:15.000000000 -0800
241+++ systemd-196/src/shared/socket-util.c 2013-01-21 16:10:46.811537609 -0800
235@@ -39,6 +39,8 @@ 242@@ -39,6 +39,8 @@
236 #include "socket-util.h" 243 #include "socket-util.h"
237 #include "missing.h" 244 #include "missing.h"
@@ -241,7 +248,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
241 int socket_address_parse(SocketAddress *a, const char *s) { 248 int socket_address_parse(SocketAddress *a, const char *s) {
242 int r; 249 int r;
243 char *e, *n; 250 char *e, *n;
244@@ -201,8 +203,16 @@ 251@@ -202,8 +204,16 @@
245 a->type = SOCK_RAW; 252 a->type = SOCK_RAW;
246 253
247 errno = 0; 254 errno = 0;
@@ -257,20 +264,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
257+ } 264+ }
258+#endif /* HAVE_MSFORMAT */ 265+#endif /* HAVE_MSFORMAT */
259 266
260 if ((family = netlink_family_from_string(sfamily)) < 0) 267 family = netlink_family_from_string(sfamily);
261 if (safe_atoi(sfamily, &family) < 0) { 268 if (family < 0)
262--- systemd-pam-185/src/tmpfiles/tmpfiles.c.orig 2012-06-22 23:25:21.000000000 -0400 269Index: systemd-196/src/tmpfiles/tmpfiles.c
263+++ systemd-pam-185/src/tmpfiles/tmpfiles.c 2012-06-22 23:13:49.000000000 -0400 270===================================================================
264@@ -48,6 +48,8 @@ 271--- systemd-196.orig/src/tmpfiles/tmpfiles.c 2012-10-23 16:06:30.000000000 -0700
265 #include "set.h" 272+++ systemd-196/src/tmpfiles/tmpfiles.c 2013-01-21 16:10:46.811537609 -0800
273@@ -51,6 +51,8 @@
266 #include "conf-files.h" 274 #include "conf-files.h"
275 #include "capability.h"
267 276
268+#include "config.h" 277+#include "config.h"
269+ 278+
270 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates 279 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
271 * them in the file system. This is intended to be used to create 280 * them in the file system. This is intended to be used to create
272 * properly owned directories beneath /tmp, /var/tmp, /run, which are 281 * properly owned directories beneath /tmp, /var/tmp, /run, which are
273@@ -970,7 +972,7 @@ 282@@ -990,7 +992,7 @@
274 i = new0(Item, 1); 283 i = new0(Item, 1);
275 if (!i) 284 if (!i)
276 return log_oom(); 285 return log_oom();
@@ -279,7 +288,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
279 if (sscanf(buffer, 288 if (sscanf(buffer,
280 "%c " 289 "%c "
281 "%ms " 290 "%ms "
282@@ -986,6 +988,28 @@ 291@@ -1006,6 +1008,28 @@
283 &group, 292 &group,
284 &age, 293 &age,
285 &n) < 2) { 294 &n) < 2) {
@@ -308,8 +317,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
308 log_error("[%s:%u] Syntax error.", fname, line); 317 log_error("[%s:%u] Syntax error.", fname, line);
309 r = -EIO; 318 r = -EIO;
310 goto finish; 319 goto finish;
311--- systemd-pam-185/src/cryptsetup/cryptsetup-generator.c.orig 2012-06-22 23:25:47.000000000 -0400 320Index: systemd-196/src/cryptsetup/cryptsetup-generator.c
312+++ systemd-pam-185/src/cryptsetup/cryptsetup-generator.c 2012-06-22 23:16:35.000000000 -0400 321===================================================================
322--- systemd-196.orig/src/cryptsetup/cryptsetup-generator.c 2012-08-08 14:53:24.000000000 -0700
323+++ systemd-196/src/cryptsetup/cryptsetup-generator.c 2013-01-21 16:10:46.811537609 -0800
313@@ -30,6 +30,8 @@ 324@@ -30,6 +30,8 @@
314 #include "virt.h" 325 #include "virt.h"
315 #include "strv.h" 326 #include "strv.h"