summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-11-10 21:45:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-12 16:00:28 +0000
commitc7a80e429e9bb989c514e00e978f19554f2ed94a (patch)
treec047f5ea666370d19f8cb86f59b4ec48556e01f2
parenta6784563ef7874cf37b887bb1949b1ef58d41afd (diff)
downloadpoky-c7a80e429e9bb989c514e00e978f19554f2ed94a.tar.gz
systemd: Upgrade 206 -> 208
Remove patches accepted upstream Forward-port uclibc patches Create additional packages to bundle zsh support files (From OE-Core rev: 9131cd014443243dc41c828efdcc8d87b179940d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch32
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch137
-rw-r--r--meta/recipes-core/systemd/systemd_208.bb (renamed from meta/recipes-core/systemd/systemd_206.bb)12
3 files changed, 76 insertions, 105 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch b/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
deleted file mode 100644
index 4a35c2301a..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Submitted
2
3From cfdd1eb76dced87c73bac8ec22d3a10244c9bbf6 Mon Sep 17 00:00:00 2001
4From: Khem Raj <raj.khem@gmail.com>
5Date: Wed, 21 Aug 2013 20:25:19 -0700
6Subject: [PATCH] use CAP_MKNOD ConditionCapability
7
8Fixes errors seen when booting VMs on QEMU like
9
10systemd[1]: kmod-static-nodes.service: main process exited, code=exited, status=203/EXEC
11systemd[1]: Failed to start Create list of required static device nodes for the current kernel.
12systemd[1]: Unit kmod-static-nodes.service entered failed state.
13
14Make sure that mknod capability is available
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 units/kmod-static-nodes.service.in | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21Index: systemd-206/units/kmod-static-nodes.service.in
22===================================================================
23--- systemd-206.orig/units/kmod-static-nodes.service.in 2013-08-21 19:13:02.000000000 -0700
24+++ systemd-206/units/kmod-static-nodes.service.in 2013-08-21 20:39:13.310689871 -0700
25@@ -9,6 +9,7 @@
26 Description=Create list of required static device nodes for the current kernel
27 DefaultDependencies=no
28 Before=sysinit.target systemd-tmpfiles-setup-dev.service
29+ConditionCapability=CAP_MKNOD
30
31 [Service]
32 Type=oneshot
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 77bb305874..e8a9144d86 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
@@ -1,10 +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
4Index: systemd-204/src/fsck/fsck.c 4Index: systemd-208/src/fsck/fsck.c
5=================================================================== 5===================================================================
6--- systemd-204.orig/src/fsck/fsck.c 2013-04-02 05:48:49.000000000 -0700 6--- systemd-208.orig/src/fsck/fsck.c 2013-08-13 13:02:46.000000000 -0700
7+++ systemd-204/src/fsck/fsck.c 2013-05-23 11:26:51.776345015 -0700 7+++ systemd-208/src/fsck/fsck.c 2013-11-05 22:01:26.776490078 -0800
8@@ -37,6 +37,8 @@ 8@@ -37,6 +37,8 @@
9 #include "virt.h" 9 #include "virt.h"
10 #include "fileio.h" 10 #include "fileio.h"
@@ -33,10 +33,10 @@ Index: systemd-204/src/fsck/fsck.c
33 33
34 /* Only show one progress counter at max */ 34 /* Only show one progress counter at max */
35 if (!locked) { 35 if (!locked) {
36Index: systemd-204/src/core/swap.c 36Index: systemd-208/src/core/swap.c
37=================================================================== 37===================================================================
38--- systemd-204.orig/src/core/swap.c 2013-05-06 12:06:04.000000000 -0700 38--- systemd-208.orig/src/core/swap.c 2013-09-26 11:20:30.000000000 -0700
39+++ systemd-204/src/core/swap.c 2013-05-23 11:26:51.780345015 -0700 39+++ systemd-208/src/core/swap.c 2013-11-05 22:01:26.776490078 -0800
40@@ -41,6 +41,8 @@ 40@@ -41,6 +41,8 @@
41 #include "path-util.h" 41 #include "path-util.h"
42 #include "virt.h" 42 #include "virt.h"
@@ -46,15 +46,15 @@ Index: systemd-204/src/core/swap.c
46 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { 46 static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
47 [SWAP_DEAD] = UNIT_INACTIVE, 47 [SWAP_DEAD] = UNIT_INACTIVE,
48 [SWAP_ACTIVATING] = UNIT_ACTIVATING, 48 [SWAP_ACTIVATING] = UNIT_ACTIVATING,
49@@ -1055,6 +1057,7 @@ 49@@ -1041,6 +1043,7 @@
50 char *dev = NULL, *d; 50 _cleanup_free_ char *dev = NULL, *d = NULL;
51 int prio = 0, k; 51 int prio = 0, k;
52 52
53+#ifdef HAVE_MSFORMAT 53+#ifdef HAVE_MSFORMAT
54 k = fscanf(m->proc_swaps, 54 k = fscanf(m->proc_swaps,
55 "%ms " /* device/file */ 55 "%ms " /* device/file */
56 "%*s " /* type of swap */ 56 "%*s " /* type of swap */
57@@ -1062,6 +1065,16 @@ 57@@ -1048,6 +1051,16 @@
58 "%*s " /* used */ 58 "%*s " /* used */
59 "%i\n", /* priority */ 59 "%i\n", /* priority */
60 &dev, &prio); 60 &dev, &prio);
@@ -71,10 +71,10 @@ Index: systemd-204/src/core/swap.c
71 if (k != 2) { 71 if (k != 2) {
72 if (k == EOF) 72 if (k == EOF)
73 break; 73 break;
74Index: systemd-204/src/core/mount-setup.c 74Index: systemd-208/src/core/mount-setup.c
75=================================================================== 75===================================================================
76--- systemd-204.orig/src/core/mount-setup.c 2013-04-24 06:34:38.000000000 -0700 76--- systemd-208.orig/src/core/mount-setup.c 2013-08-13 13:02:46.000000000 -0700
77+++ systemd-204/src/core/mount-setup.c 2013-05-23 11:26:51.780345015 -0700 77+++ systemd-208/src/core/mount-setup.c 2013-11-05 22:01:26.776490078 -0800
78@@ -28,6 +28,7 @@ 78@@ -28,6 +28,7 @@
79 #include <assert.h> 79 #include <assert.h>
80 #include <unistd.h> 80 #include <unistd.h>
@@ -107,10 +107,10 @@ Index: systemd-204/src/core/mount-setup.c
107 if (feof(f)) 107 if (feof(f))
108 break; 108 break;
109 109
110Index: systemd-204/src/core/mount.c 110Index: systemd-208/src/core/mount.c
111=================================================================== 111===================================================================
112--- systemd-204.orig/src/core/mount.c 2013-05-06 12:06:04.000000000 -0700 112--- systemd-208.orig/src/core/mount.c 2013-09-26 11:20:30.000000000 -0700
113+++ systemd-204/src/core/mount.c 2013-05-23 11:26:51.780345015 -0700 113+++ systemd-208/src/core/mount.c 2013-11-05 22:07:43.784497482 -0800
114@@ -43,6 +43,8 @@ 114@@ -43,6 +43,8 @@
115 #include "exit-status.h" 115 #include "exit-status.h"
116 #include "def.h" 116 #include "def.h"
@@ -120,52 +120,51 @@ Index: systemd-204/src/core/mount.c
120 static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { 120 static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
121 [MOUNT_DEAD] = UNIT_INACTIVE, 121 [MOUNT_DEAD] = UNIT_INACTIVE,
122 [MOUNT_MOUNTING] = UNIT_ACTIVATING, 122 [MOUNT_MOUNTING] = UNIT_ACTIVATING,
123@@ -1626,7 +1628,7 @@ 123@@ -1559,6 +1561,7 @@
124 _cleanup_free_ char *device = NULL, *path = NULL, *options = NULL, *options2 = NULL, *fstype = NULL, *d = NULL, *p = NULL, *o = NULL;
124 int k; 125 int k;
125 126
126 device = path = options = options2 = fstype = d = p = o = NULL;
127-
128+#ifdef HAVE_MSFORMAT 127+#ifdef HAVE_MSFORMAT
129 if ((k = fscanf(m->proc_self_mountinfo, 128 k = fscanf(m->proc_self_mountinfo,
130 "%*s " /* (1) mount id */ 129 "%*s " /* (1) mount id */
131 "%*s " /* (2) parent id */ 130 "%*s " /* (2) parent id */
132@@ -1645,7 +1647,31 @@ 131@@ -1577,7 +1580,31 @@
133 &fstype, 132 &fstype,
134 &device, 133 &device,
135 &options2)) != 5) { 134 &options2);
136- 135-
137+#else 136+#else
138+ path = malloc(257); 137+ path = malloc(257);
139+ options = malloc(257); 138+ options = malloc(257);
140+ fstype = malloc(257); 139+ fstype = malloc(257);
141+ device = malloc(257); 140+ device = malloc(257);
142+ options2 = malloc(257); 141+ options2 = malloc(257);
143+ if ((k = fscanf(m->proc_self_mountinfo, 142+ k = fscanf(m->proc_self_mountinfo,
144+ "%*s " /* (1) mount id */ 143+ "%*s " /* (1) mount id */
145+ "%*s " /* (2) parent id */ 144+ "%*s " /* (2) parent id */
146+ "%*s " /* (3) major:minor */ 145+ "%*s " /* (3) major:minor */
147+ "%*s " /* (4) root */ 146+ "%*s " /* (4) root */
148+ "%256s " /* (5) mount point */ 147+ "%256s " /* (5) mount point */
149+ "%256s" /* (6) mount options */ 148+ "%256s" /* (6) mount options */
150+ "%*[^-]" /* (7) optional fields */ 149+ "%*[^-]" /* (7) optional fields */
151+ "- " /* (8) separator */ 150+ "- " /* (8) separator */
152+ "%256s " /* (9) file system type */ 151+ "%256s " /* (9) file system type */
153+ "%256s" /* (10) mount source */ 152+ "%256s" /* (10) mount source */
154+ "%256s" /* (11) mount options 2 */ 153+ "%256s" /* (11) mount options 2 */
155+ "%*[^\n]", /* some rubbish at the end */ 154+ "%*[^\n]", /* some rubbish at the end */
156+ path, 155+ path,
157+ options, 156+ options,
158+ fstype, 157+ fstype,
159+ device, 158+ device,
160+ options2)) != 5) { 159+ options2);
161+#endif /* HAVE_MSFORMAT */ 160+#endif /* HAVE_MSFORMAT */
162 if (k == EOF) 161 if (k == EOF)
163 break; 162 break;
164 163
165Index: systemd-204/src/core/umount.c 164Index: systemd-208/src/core/umount.c
166=================================================================== 165===================================================================
167--- systemd-204.orig/src/core/umount.c 2013-04-18 08:14:11.000000000 -0700 166--- systemd-208.orig/src/core/umount.c 2013-08-13 13:02:46.000000000 -0700
168+++ systemd-204/src/core/umount.c 2013-05-23 11:26:51.780345015 -0700 167+++ systemd-208/src/core/umount.c 2013-11-05 22:01:26.776490078 -0800
169@@ -36,6 +36,8 @@ 168@@ -36,6 +36,8 @@
170 #include "util.h" 169 #include "util.h"
171 #include "virt.h" 170 #include "virt.h"
@@ -235,10 +234,10 @@ Index: systemd-204/src/core/umount.c
235 if (k == EOF) 234 if (k == EOF)
236 break; 235 break;
237 236
238Index: systemd-204/src/shared/socket-util.c 237Index: systemd-208/src/shared/socket-util.c
239=================================================================== 238===================================================================
240--- systemd-204.orig/src/shared/socket-util.c 2013-04-18 08:14:11.000000000 -0700 239--- systemd-208.orig/src/shared/socket-util.c 2013-09-26 11:20:30.000000000 -0700
241+++ systemd-204/src/shared/socket-util.c 2013-05-23 11:30:53.528348084 -0700 240+++ systemd-208/src/shared/socket-util.c 2013-11-05 22:01:26.776490078 -0800
242@@ -40,6 +40,8 @@ 241@@ -40,6 +40,8 @@
243 #include "missing.h" 242 #include "missing.h"
244 #include "fileio.h" 243 #include "fileio.h"
@@ -266,28 +265,28 @@ Index: systemd-204/src/shared/socket-util.c
266 265
267 family = netlink_family_from_string(sfamily); 266 family = netlink_family_from_string(sfamily);
268 if (family < 0) 267 if (family < 0)
269Index: systemd-204/src/tmpfiles/tmpfiles.c 268Index: systemd-208/src/tmpfiles/tmpfiles.c
270=================================================================== 269===================================================================
271--- systemd-204.orig/src/tmpfiles/tmpfiles.c 2013-04-24 06:34:38.000000000 -0700 270--- systemd-208.orig/src/tmpfiles/tmpfiles.c 2013-09-17 14:55:37.000000000 -0700
272+++ systemd-204/src/tmpfiles/tmpfiles.c 2013-05-23 11:26:51.784345016 -0700 271+++ systemd-208/src/tmpfiles/tmpfiles.c 2013-11-05 22:01:26.776490078 -0800
273@@ -52,6 +52,8 @@ 272@@ -53,6 +53,8 @@
274 #include "conf-files.h"
275 #include "capability.h" 273 #include "capability.h"
274 #include "specifier.h"
276 275
277+#include "config.h" 276+#include "config.h"
278+ 277+
279 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates 278 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
280 * them in the file system. This is intended to be used to create 279 * them in the file system. This is intended to be used to create
281 * properly owned directories beneath /tmp, /var/tmp, /run, which are 280 * properly owned directories beneath /tmp, /var/tmp, /run, which are
282@@ -1029,6 +1031,7 @@ 281@@ -1082,6 +1084,7 @@
283 if (!i) 282 assert(line >= 1);
284 return log_oom(); 283 assert(buffer);
285 284
286+#ifdef HAVE_MSFORMAT 285+#ifdef HAVE_MSFORMAT
287 r = sscanf(buffer, 286 r = sscanf(buffer,
288 "%c %ms %ms %ms %ms %ms %n", 287 "%c %ms %ms %ms %ms %ms %n",
289 &type, 288 &type,
290@@ -1038,6 +1041,29 @@ 289@@ -1091,6 +1094,29 @@
291 &group, 290 &group,
292 &age, 291 &age,
293 &n); 292 &n);
@@ -317,10 +316,10 @@ Index: systemd-204/src/tmpfiles/tmpfiles.c
317 if (r < 2) { 316 if (r < 2) {
318 log_error("[%s:%u] Syntax error.", fname, line); 317 log_error("[%s:%u] Syntax error.", fname, line);
319 return -EIO; 318 return -EIO;
320Index: systemd-204/src/cryptsetup/cryptsetup-generator.c 319Index: systemd-208/src/cryptsetup/cryptsetup-generator.c
321=================================================================== 320===================================================================
322--- systemd-204.orig/src/cryptsetup/cryptsetup-generator.c 2013-05-06 12:06:04.000000000 -0700 321--- systemd-208.orig/src/cryptsetup/cryptsetup-generator.c 2013-09-30 09:57:04.000000000 -0700
323+++ systemd-204/src/cryptsetup/cryptsetup-generator.c 2013-05-23 11:26:51.784345016 -0700 322+++ systemd-208/src/cryptsetup/cryptsetup-generator.c 2013-11-05 22:01:26.776490078 -0800
324@@ -31,6 +31,8 @@ 323@@ -31,6 +31,8 @@
325 #include "strv.h" 324 #include "strv.h"
326 #include "fileio.h" 325 #include "fileio.h"
@@ -330,7 +329,7 @@ Index: systemd-204/src/cryptsetup/cryptsetup-generator.c
330 static const char *arg_dest = "/tmp"; 329 static const char *arg_dest = "/tmp";
331 static bool arg_enabled = true; 330 static bool arg_enabled = true;
332 static bool arg_read_crypttab = true; 331 static bool arg_read_crypttab = true;
333@@ -398,7 +400,16 @@ 332@@ -420,7 +422,16 @@
334 if (*l == '#' || *l == 0) 333 if (*l == '#' || *l == 0)
335 continue; 334 continue;
336 335
diff --git a/meta/recipes-core/systemd/systemd_206.bb b/meta/recipes-core/systemd/systemd_208.bb
index a1a8bd7ceb..ee716f43e1 100644
--- a/meta/recipes-core/systemd/systemd_206.bb
+++ b/meta/recipes-core/systemd/systemd_208.bb
@@ -18,7 +18,6 @@ SECTION = "base/shell"
18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest 18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
19 19
20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ 20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
21 file://0001-use-CAP_MKNOD-ConditionCapability.patch \
22 file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \ 21 file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \
23 file://binfmt-install.patch \ 22 file://binfmt-install.patch \
24 file://touchscreen.rules \ 23 file://touchscreen.rules \
@@ -27,8 +26,8 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
27 file://init \ 26 file://init \
28 file://run-ptest \ 27 file://run-ptest \
29 " 28 "
30SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc" 29SRC_URI[md5sum] = "df64550d92afbffb4f67a434193ee165"
31SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de" 30SRC_URI[sha256sum] = "aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"
32 31
33UCLIBCPATCHES = "" 32UCLIBCPATCHES = ""
34UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ 33UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \
@@ -134,7 +133,8 @@ python populate_packages_prepend (){
134} 133}
135PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" 134PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
136 135
137PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install ${PN}-rpm-macros ${PN}-binfmt" 136PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
137 ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
138 138
139SYSTEMD_PACKAGES = "${PN}-binfmt" 139SYSTEMD_PACKAGES = "${PN}-binfmt"
140SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" 140SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -160,6 +160,10 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \
160FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ 160FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
161 " 161 "
162 162
163FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)}"
164
165FILES_${PN}-zsh = "${datadir}/zsh/site-functions"
166
163FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ 167FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
164 ${exec_prefix}/lib/binfmt.d \ 168 ${exec_prefix}/lib/binfmt.d \
165 ${rootlibexecdir}/systemd/systemd-binfmt \ 169 ${rootlibexecdir}/systemd/systemd-binfmt \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 01:42:35 +0000