summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch121
-rw-r--r--meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch176
-rw-r--r--meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch56
-rw-r--r--meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch34
-rw-r--r--meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch29
-rw-r--r--meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch142
-rw-r--r--meta/recipes-core/systemd/systemd/binfmt-install.patch35
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch50
-rw-r--r--meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch19
-rw-r--r--meta/recipes-core/systemd/systemd_218.bb (renamed from meta/recipes-core/systemd/systemd_216.bb)34
10 files changed, 114 insertions, 582 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
index c5ad29174c..a86c8410df 100644
--- a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
@@ -21,11 +21,11 @@ Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
21 units/rescue.service.m4.in | 4 ++-- 21 units/rescue.service.m4.in | 4 ++--
22 8 files changed, 20 insertions(+), 11 deletions(-) 22 8 files changed, 20 insertions(+), 11 deletions(-)
23 23
24diff --git a/Makefile.am b/Makefile.am 24Index: git/Makefile.am
25index 4028112..5d18f5c 100644 25===================================================================
26--- a/Makefile.am 26--- git.orig/Makefile.am
27+++ b/Makefile.am 27+++ git/Makefile.am
28@@ -191,6 +191,7 @@ AM_CPPFLAGS = \ 28@@ -195,6 +195,7 @@ AM_CPPFLAGS = \
29 -DKEXEC=\"$(KEXEC)\" \ 29 -DKEXEC=\"$(KEXEC)\" \
30 -DLIBDIR=\"$(libdir)\" \ 30 -DLIBDIR=\"$(libdir)\" \
31 -DROOTLIBDIR=\"$(rootlibdir)\" \ 31 -DROOTLIBDIR=\"$(rootlibdir)\" \
@@ -33,7 +33,7 @@ index 4028112..5d18f5c 100644
33 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ 33 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
34 -I $(top_srcdir)/src \ 34 -I $(top_srcdir)/src \
35 -I $(top_builddir)/src/shared \ 35 -I $(top_builddir)/src/shared \
36@@ -5584,6 +5585,7 @@ EXTRA_DIST += \ 36@@ -5830,6 +5831,7 @@ EXTRA_DIST += \
37 substitutions = \ 37 substitutions = \
38 '|rootlibexecdir=$(rootlibexecdir)|' \ 38 '|rootlibexecdir=$(rootlibexecdir)|' \
39 '|rootbindir=$(rootbindir)|' \ 39 '|rootbindir=$(rootbindir)|' \
@@ -41,14 +41,14 @@ index 4028112..5d18f5c 100644
41 '|bindir=$(bindir)|' \ 41 '|bindir=$(bindir)|' \
42 '|SYSTEMCTL=$(rootbindir)/systemctl|' \ 42 '|SYSTEMCTL=$(rootbindir)/systemctl|' \
43 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ 43 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
44diff --git a/configure.ac b/configure.ac 44Index: git/configure.ac
45index 18b7198..365bc73 100644 45===================================================================
46--- a/configure.ac 46--- git.orig/configure.ac
47+++ b/configure.ac 47+++ git/configure.ac
48@@ -1272,6 +1272,11 @@ AC_ARG_WITH([rootlibdir], 48@@ -1310,6 +1310,11 @@ AC_ARG_WITH([rootlibdir],
49 [], 49 [],
50 [with_rootlibdir=${libdir}]) 50 [with_rootlibdir=${libdir}])
51 51
52+AC_ARG_WITH([roothomedir], 52+AC_ARG_WITH([roothomedir],
53+ AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]), 53+ AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]),
54+ [], 54+ [],
@@ -57,15 +57,15 @@ index 18b7198..365bc73 100644
57 AC_ARG_WITH([pamlibdir], 57 AC_ARG_WITH([pamlibdir],
58 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), 58 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
59 [], 59 [],
60@@ -1317,6 +1322,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) 60@@ -1362,6 +1367,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
61 AC_SUBST([pamconfdir], [$with_pamconfdir]) 61 AC_SUBST([pamconfdir], [$with_pamconfdir])
62 AC_SUBST([rootprefix], [$with_rootprefix]) 62 AC_SUBST([rootprefix], [$with_rootprefix])
63 AC_SUBST([rootlibdir], [$with_rootlibdir]) 63 AC_SUBST([rootlibdir], [$with_rootlibdir])
64+AC_SUBST([roothomedir], [$with_roothomedir]) 64+AC_SUBST([roothomedir], [$with_roothomedir])
65 65
66 AC_CONFIG_FILES([ 66 AC_CONFIG_FILES([
67 Makefile po/Makefile.in 67 Makefile po/Makefile.in
68@@ -1400,6 +1406,7 @@ AC_MSG_RESULT([ 68@@ -1446,6 +1452,7 @@ AC_MSG_RESULT([
69 include_prefix: ${INCLUDE_PREFIX} 69 include_prefix: ${INCLUDE_PREFIX}
70 lib dir: ${libdir} 70 lib dir: ${libdir}
71 rootlib dir: ${with_rootlibdir} 71 rootlib dir: ${with_rootlibdir}
@@ -73,55 +73,55 @@ index 18b7198..365bc73 100644
73 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 73 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
74 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 74 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
75 Build Python: ${PYTHON} 75 Build Python: ${PYTHON}
76diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c 76Index: git/src/core/unit-printf.c
77index 62599d0..852d34c 100644 77===================================================================
78--- a/src/core/unit-printf.c 78--- git.orig/src/core/unit-printf.c
79+++ b/src/core/unit-printf.c 79+++ git/src/core/unit-printf.c
80@@ -259,7 +259,7 @@ static int specifier_user_home(char specifier, void *data, void *userdata, char 80@@ -259,7 +259,7 @@ static int specifier_user_home(char spec
81 * best of it if we can, but fail if we can't */ 81 * best of it if we can, but fail if we can't */
82 82
83 if (!c->user || streq(c->user, "root") || streq(c->user, "0")) 83 if (!c->user || streq(c->user, "root") || streq(c->user, "0"))
84- n = strdup("/root"); 84- n = strdup("/root");
85+ n = strdup(ROOTHOMEDIR); 85+ n = strdup(ROOTHOMEDIR);
86 else 86 else
87 return -ENOTSUP; 87 return -ENOTSUP;
88 88
89diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 89Index: git/src/nspawn/nspawn.c
90index d01da45..3e876d5 100644 90===================================================================
91--- a/src/nspawn/nspawn.c 91--- git.orig/src/nspawn/nspawn.c
92+++ b/src/nspawn/nspawn.c 92+++ git/src/nspawn/nspawn.c
93@@ -3312,7 +3312,7 @@ int main(int argc, char *argv[]) { 93@@ -3183,7 +3183,7 @@ int main(int argc, char *argv[]) {
94 if (r < 0) 94 if (r < 0)
95 _exit(EXIT_FAILURE); 95 _exit(EXIT_FAILURE);
96 96
97- if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) || 97- if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) ||
98+ if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) || 98+ if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) ||
99 (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || 99 (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) ||
100 (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) { 100 (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) {
101 log_oom(); 101 log_oom();
102@@ -3402,7 +3402,7 @@ int main(int argc, char *argv[]) { 102@@ -3278,7 +3278,7 @@ int main(int argc, char *argv[]) {
103 } else if (argc > optind) 103 execvp(argv[optind], argv + optind);
104 execvpe(argv[optind], argv + optind, env_use); 104 #endif /* HAVE_EXECVPE */
105 else { 105 else {
106- chdir(home ? home : "/root"); 106- chdir(home ? home : "/root");
107+ chdir(home ? home : ROOTHOMEDIR); 107+ chdir(home ? home : ROOTHOMEDIR);
108 execle("/bin/bash", "-bash", NULL, env_use); 108 execle("/bin/bash", "-bash", NULL, env_use);
109 execle("/bin/sh", "-sh", NULL, env_use); 109 execle("/bin/sh", "-sh", NULL, env_use);
110 } 110 }
111diff --git a/src/shared/util.c b/src/shared/util.c 111Index: git/src/shared/util.c
112index 85a570a..aef6033 100644 112===================================================================
113--- a/src/shared/util.c 113--- git.orig/src/shared/util.c
114+++ b/src/shared/util.c 114+++ git/src/shared/util.c
115@@ -4377,7 +4377,7 @@ int get_user_creds( 115@@ -4523,7 +4523,7 @@ int get_user_creds(
116 *gid = 0; 116 *gid = 0;
117 117
118 if (home) 118 if (home)
119- *home = "/root"; 119- *home = "/root";
120+ *home = ROOTHOMEDIR; 120+ *home = ROOTHOMEDIR;
121 121
122 if (shell) 122 if (shell)
123 *shell = "/bin/sh"; 123 *shell = "/bin/sh";
124@@ -5363,7 +5363,7 @@ int get_home_dir(char **_h) { 124@@ -5491,7 +5491,7 @@ int get_home_dir(char **_h) {
125 /* Hardcode home directory for root to avoid NSS */ 125 /* Hardcode home directory for root to avoid NSS */
126 u = getuid(); 126 u = getuid();
127 if (u == 0) { 127 if (u == 0) {
@@ -129,14 +129,14 @@ index 85a570a..aef6033 100644
129+ h = strdup(ROOTHOMEDIR); 129+ h = strdup(ROOTHOMEDIR);
130 if (!h) 130 if (!h)
131 return -ENOMEM; 131 return -ENOMEM;
132 132
133diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in 133Index: git/units/console-shell.service.m4.in
134index 3f4904a..e2af652 100644 134===================================================================
135--- a/units/console-shell.service.m4.in 135--- git.orig/units/console-shell.service.m4.in
136+++ b/units/console-shell.service.m4.in 136+++ git/units/console-shell.service.m4.in
137@@ -15,8 +15,8 @@ After=rc-local.service 137@@ -15,8 +15,8 @@ After=rc-local.service
138 Before=getty.target 138 Before=getty.target
139 139
140 [Service] 140 [Service]
141-Environment=HOME=/root 141-Environment=HOME=/root
142-WorkingDirectory=/root 142-WorkingDirectory=/root
@@ -145,36 +145,33 @@ index 3f4904a..e2af652 100644
145 ExecStart=-/sbin/sulogin 145 ExecStart=-/sbin/sulogin
146 ExecStopPost=-@SYSTEMCTL@ poweroff 146 ExecStopPost=-@SYSTEMCTL@ poweroff
147 Type=idle 147 Type=idle
148diff --git a/units/emergency.service.in b/units/emergency.service.in 148Index: git/units/emergency.service.in
149index 91fc1bb..659547e 100644 149===================================================================
150--- a/units/emergency.service.in 150--- git.orig/units/emergency.service.in
151+++ b/units/emergency.service.in 151+++ git/units/emergency.service.in
152@@ -13,8 +13,8 @@ Conflicts=shutdown.target 152@@ -14,8 +14,8 @@ Conflicts=rescue.service
153 Before=shutdown.target 153 Before=shutdown.target
154 154
155 [Service] 155 [Service]
156-Environment=HOME=/root 156-Environment=HOME=/root
157-WorkingDirectory=/root 157-WorkingDirectory=/root
158+Environment=HOME=@roothomedir@ 158+Environment=HOME=@roothomedir@
159+WorkingDirectory=@roothomedir@ 159+WorkingDirectory=@roothomedir@
160 ExecStartPre=-/bin/plymouth quit 160 ExecStartPre=-/bin/plymouth quit
161 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' 161 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
162 ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" 162 ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
163diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in 163Index: git/units/rescue.service.in
164index ef54369..7aad86f 100644 164===================================================================
165--- a/units/rescue.service.m4.in 165--- git.orig/units/rescue.service.in
166+++ b/units/rescue.service.m4.in 166+++ git/units/rescue.service.in
167@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service 167@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.serv
168 Before=shutdown.target 168 Before=shutdown.target
169 169
170 [Service] 170 [Service]
171-Environment=HOME=/root 171-Environment=HOME=/root
172-WorkingDirectory=/root 172-WorkingDirectory=/root
173+Environment=HOME=@roothomedir@ 173+Environment=HOME=@roothomedir@
174+WorkingDirectory=@roothomedir@ 174+WorkingDirectory=@roothomedir@
175 ExecStartPre=-/bin/plymouth quit 175 ExecStartPre=-/bin/plymouth quit
176 ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.' 176 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
177 ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" 177 ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
178--
1791.9.3
180
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
deleted file mode 100644
index e0043597a2..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
+++ /dev/null
@@ -1,176 +0,0 @@
1From 5a16bc264c32237e38a844d55e7a1820a31b8440 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
3Date: Fri, 28 Nov 2014 15:59:59 +0100
4Subject: [PATCH] build-sys: configure the list of system users, files and
5 directories
6
7Choose which system users defined in sysusers.d/systemd.conf and files
8or directories in tmpfiles.d/systemd.conf, should be provided depending
9on comile-time configuration.
10
11Upstream-Status: Backport
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 Makefile.am | 4 ++++
15 configure.ac | 2 ++
16 sysusers.d/.gitignore | 1 +
17 sysusers.d/{systemd.conf => systemd.conf.m4} | 8 ++++++++
18 tmpfiles.d/.gitignore | 3 ++-
19 tmpfiles.d/{systemd.conf => systemd.conf.m4} | 2 ++
20 6 files changed, 19 insertions(+), 1 deletion(-)
21 rename sysusers.d/{systemd.conf => systemd.conf.m4} (77%)
22 rename tmpfiles.d/{systemd.conf => systemd.conf.m4} (96%)
23
24Index: git/Makefile.am
25===================================================================
26--- git.orig/Makefile.am 2015-01-23 21:23:04.000000000 +0000
27+++ git/Makefile.am 2015-01-23 21:23:04.000000000 +0000
28@@ -5698,6 +5698,10 @@
29 $(AM_V_at)$(MKDIR_P) $(dir $@)
30 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
31
32+sysusers.d/%: sysusers.d/%.m4
33+ $(AM_V_at)$(MKDIR_P) $(dir $@)
34+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
35+
36 tmpfiles.d/%: tmpfiles.d/%.m4
37 $(AM_V_at)$(MKDIR_P) $(dir $@)
38 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
39Index: git/configure.ac
40===================================================================
41--- git.orig/configure.ac 2015-01-23 21:23:04.000000000 +0000
42+++ git/configure.ac 2015-01-23 21:23:04.000000000 +0000
43@@ -971,6 +971,7 @@
44 AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable timesync daemon]))
45 if test "x$enable_timesyncd" != "xno"; then
46 have_timesyncd=yes
47+ M4_DEFINES="$M4_DEFINES -DENABLE_TIMESYNCD"
48 fi
49 AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"])
50
51@@ -1060,6 +1061,7 @@
52 AS_IF([test "x$enable_networkd" != "xno"], [
53 AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled])
54 have_networkd=yes
55+ M4_DEFINES="$M4_DEFINES -DENABLE_NETWORKD"
56 ])
57 AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"])
58
59Index: git/sysusers.d/systemd.conf
60===================================================================
61--- git.orig/sysusers.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000
62+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
63@@ -1,12 +0,0 @@
64-# This file is part of systemd.
65-#
66-# systemd is free software; you can redistribute it and/or modify it
67-# under the terms of the GNU Lesser General Public License as published by
68-# the Free Software Foundation; either version 2.1 of the License, or
69-# (at your option) any later version.
70-
71-g systemd-journal - -
72-u systemd-bus-proxy - "systemd Bus Proxy"
73-u systemd-network - "systemd Network Management"
74-u systemd-resolve - "systemd Resolver"
75-u systemd-timesync - "systemd Time Synchronization"
76Index: git/sysusers.d/systemd.conf.m4
77===================================================================
78--- /dev/null 1970-01-01 00:00:00.000000000 +0000
79+++ git/sysusers.d/systemd.conf.m4 2015-01-23 21:26:30.000000000 +0000
80@@ -0,0 +1,20 @@
81+# This file is part of systemd.
82+#
83+# systemd is free software; you can redistribute it and/or modify it
84+# under the terms of the GNU Lesser General Public License as published by
85+# the Free Software Foundation; either version 2.1 of the License, or
86+# (at your option) any later version.
87+
88+g systemd-journal - -
89+m4_ifdef(`ENABLE_KDBUS',
90+u systemd-bus-proxy - "systemd Bus Proxy"
91+)m4_dnl
92+m4_ifdef(`ENABLE_NETWORKD',
93+u systemd-network - "systemd Network Management"
94+)m4_dnl
95+m4_ifdef(`ENABLE_RESOLVED',
96+u systemd-resolve - "systemd Resolver"
97+)m4_dnl
98+m4_ifdef(`ENABLE_TIMESYNCD',
99+u systemd-timesync - "systemd Time Synchronization"
100+)m4_dnl
101Index: git/tmpfiles.d/systemd.conf
102===================================================================
103--- git.orig/tmpfiles.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000
104+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
105@@ -1,32 +0,0 @@
106-# This file is part of systemd.
107-#
108-# systemd is free software; you can redistribute it and/or modify it
109-# under the terms of the GNU Lesser General Public License as published by
110-# the Free Software Foundation; either version 2.1 of the License, or
111-# (at your option) any later version.
112-
113-# See tmpfiles.d(5) for details
114-
115-d /run/user 0755 root root -
116-F! /run/utmp 0664 root utmp -
117-
118-d /run/systemd/ask-password 0755 root root -
119-d /run/systemd/seats 0755 root root -
120-d /run/systemd/sessions 0755 root root -
121-d /run/systemd/users 0755 root root -
122-d /run/systemd/machines 0755 root root -
123-d /run/systemd/shutdown 0755 root root -
124-d /run/systemd/netif 0755 systemd-network systemd-network -
125-d /run/systemd/netif/links 0755 systemd-network systemd-network -
126-d /run/systemd/netif/leases 0755 systemd-network systemd-network -
127-
128-d /run/log 0755 root root -
129-
130-z /run/log/journal 2755 root systemd-journal - -
131-Z /run/log/journal/%m ~2750 root systemd-journal - -
132-
133-z /var/log/journal 2755 root systemd-journal - -
134-z /var/log/journal/%m 2755 root systemd-journal - -
135-
136-d /var/lib/systemd 0755 root root -
137-d /var/lib/systemd/coredump 0755 root root 3d
138Index: git/tmpfiles.d/systemd.conf.m4
139===================================================================
140--- /dev/null 1970-01-01 00:00:00.000000000 +0000
141+++ git/tmpfiles.d/systemd.conf.m4 2015-01-23 21:26:46.000000000 +0000
142@@ -0,0 +1,34 @@
143+# This file is part of systemd.
144+#
145+# systemd is free software; you can redistribute it and/or modify it
146+# under the terms of the GNU Lesser General Public License as published by
147+# the Free Software Foundation; either version 2.1 of the License, or
148+# (at your option) any later version.
149+
150+# See tmpfiles.d(5) for details
151+
152+d /run/user 0755 root root -
153+F! /run/utmp 0664 root utmp -
154+
155+d /run/systemd/ask-password 0755 root root -
156+d /run/systemd/seats 0755 root root -
157+d /run/systemd/sessions 0755 root root -
158+d /run/systemd/users 0755 root root -
159+d /run/systemd/machines 0755 root root -
160+d /run/systemd/shutdown 0755 root root -
161+m4_ifdef(`ENABLE_NETWORKD',
162+d /run/systemd/netif 0755 systemd-network systemd-network -
163+d /run/systemd/netif/links 0755 systemd-network systemd-network -
164+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
165+)m4_dnl
166+
167+d /run/log 0755 root root -
168+
169+z /run/log/journal 2755 root systemd-journal - -
170+Z /run/log/journal/%m ~2750 root systemd-journal - -
171+
172+z /var/log/journal 2755 root systemd-journal - -
173+z /var/log/journal/%m 2755 root systemd-journal - -
174+
175+d /var/lib/systemd 0755 root root -
176+d /var/lib/systemd/coredump 0755 root root 3d
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
deleted file mode 100644
index 4795f8670f..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From bedd083aaedb3bbb14ef579a047bf4b4fed56d9b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
3Date: Wed, 26 Nov 2014 09:17:50 +0100
4Subject: [PATCH] build-sys: do not install tmpfiles and sysusers files by
5 default
6
7Upstream-Status: Backport
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 Makefile.am | 14 +++++++++++---
13 1 file changed, 11 insertions(+), 3 deletions(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index ddd0df1..65bb176 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -2039,7 +2039,6 @@ nodist_tmpfiles_DATA = \
20 dist_tmpfiles_DATA = \
21 tmpfiles.d/systemd.conf \
22 tmpfiles.d/systemd-nologin.conf \
23- tmpfiles.d/systemd-remote.conf \
24 tmpfiles.d/tmp.conf \
25 tmpfiles.d/x11.conf \
26 tmpfiles.d/var.conf
27@@ -2094,8 +2093,7 @@ SYSINIT_TARGET_WANTS += \
28 systemd-sysusers.service
29
30 dist_sysusers_DATA = \
31- sysusers.d/systemd.conf \
32- sysusers.d/systemd-remote.conf
33+ sysusers.d/systemd.conf
34
35 nodist_sysusers_DATA = \
36 sysusers.d/basic.conf
37@@ -3839,6 +3837,16 @@ systemd_journal_remote_CFLAGS = \
38 systemd_journal_remote_LDADD += \
39 $(MICROHTTPD_LIBS)
40
41+if ENABLE_SYSUSERS
42+dist_sysusers_DATA += \
43+ sysusers.d/systemd-remote.conf
44+endif
45+
46+if ENABLE_TMPFILES
47+dist_tmpfiles_DATA += \
48+ tmpfiles.d/systemd-remote.conf
49+endif
50+
51 if HAVE_GNUTLS
52 systemd_journal_remote_LDADD += \
53 $(GNUTLS_LIBS)
54--
551.9.1
56
diff --git a/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch b/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
deleted file mode 100644
index 621a0da87c..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001
2From: Olivier Brunel <jjk@jjacky.com>
3Date: Fri, 5 Dec 2014 16:06:45 +0100
4Subject: [PATCH] journal: Fix navigating backwards missing entries
5
6With DIRECTION_UP (i.e. navigating backwards) in generic_array_bisect() when the
7needle was found as the last item in the array, it wasn't actually processed as
8match, resulting in entries being missed.
9
10https://bugs.freedesktop.org/show_bug.cgi?id=86855
11
12Upstream-Status: Backport
13
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15---
16 src/journal/journal-file.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
20index 7858435..c5d2d19 100644
21--- a/src/journal/journal-file.c
22+++ b/src/journal/journal-file.c
23@@ -1657,7 +1657,7 @@ static int generic_array_bisect(
24 }
25 }
26
27- if (k > n) {
28+ if (k >= n) {
29 if (direction == DIRECTION_UP) {
30 i = n;
31 subtract_one = true;
32--
332.1.3
34
diff --git a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch b/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
deleted file mode 100644
index 448ef1a917..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Backport
2
3Subject: missing.h: add fake __NR_memfd_create for MIPS
4
5We don't have the correct __NR_memfd_create syscall number yet, so set it to
60xffffffff for now to prevent compile time errors.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 src/shared/missing.h | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/src/shared/missing.h b/src/shared/missing.h
14index 3ff1a21..3051cb5 100644
15--- a/src/shared/missing.h
16+++ b/src/shared/missing.h
17@@ -167,6 +167,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
18 # define __NR_fanotify_mark 5296
19 # endif
20 # endif
21+# ifndef __NR_memfd_create
22+# define __NR_memfd_create 0xffffffff /* FIXME */
23+# endif
24 #else
25 # ifndef __NR_fanotify_init
26 # define __NR_fanotify_init 338
27--
281.9.1
29
diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
deleted file mode 100644
index b5b0168149..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
+++ /dev/null
@@ -1,142 +0,0 @@
1From aeb50ff0bd4bbbca74c4695072232348351d512d Mon Sep 17 00:00:00 2001
2From: Tom Gundersen <teg@jklm.no>
3Date: Wed, 27 Aug 2014 17:45:41 +0200
4Subject: [PATCH] tmpfiles: make resolv.conf entry conditional on resolved
5 support
6
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10---
11 Makefile.am | 15 +++++++++++++--
12 TODO | 2 --
13 configure.ac | 1 +
14 tmpfiles.d/.gitignore | 1 +
15 tmpfiles.d/{etc.conf => etc.conf.m4} | 2 ++
16 5 files changed, 17 insertions(+), 4 deletions(-)
17 create mode 100644 tmpfiles.d/.gitignore
18 rename tmpfiles.d/{etc.conf => etc.conf.m4} (95%)
19
20Index: git/Makefile.am
21===================================================================
22--- git.orig/Makefile.am 2015-01-24 00:41:20.134716451 -0800
23+++ git/Makefile.am 2015-01-24 00:41:20.126716451 -0800
24@@ -1935,14 +1935,16 @@
25 units/systemd-tmpfiles-setup.service \
26 units/systemd-tmpfiles-clean.service
27
28+nodist_tmpfiles_DATA = \
29+ tmpfiles.d/etc.conf
30+
31 dist_tmpfiles_DATA = \
32 tmpfiles.d/systemd.conf \
33 tmpfiles.d/systemd-nologin.conf \
34 tmpfiles.d/systemd-remote.conf \
35 tmpfiles.d/tmp.conf \
36 tmpfiles.d/x11.conf \
37- tmpfiles.d/var.conf \
38- tmpfiles.d/etc.conf
39+ tmpfiles.d/var.conf
40
41 if HAVE_SYSV_COMPAT
42 dist_tmpfiles_DATA += \
43@@ -1965,10 +1967,14 @@
44 endif
45
46 EXTRA_DIST += \
47+ tmpfiles.d/etc.conf.m4 \
48 units/systemd-tmpfiles-setup-dev.service.in \
49 units/systemd-tmpfiles-setup.service.in \
50 units/systemd-tmpfiles-clean.service.in
51
52+CLEANFILES += \
53+ tmpfiles.d/etc.conf
54+
55 # ------------------------------------------------------------------------------
56 if ENABLE_SYSUSERS
57 systemd_sysusers_SOURCES = \
58@@ -5684,6 +5690,11 @@
59 $(AM_V_at)$(MKDIR_P) $(dir $@)
60 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
61
62+tmpfiles.d/%: tmpfiles.d/%.m4
63+ $(AM_V_at)$(MKDIR_P) $(dir $@)
64+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
65+
66+
67 units/%: units/%.m4
68 $(AM_V_at)$(MKDIR_P) $(dir $@)
69 $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
70Index: git/TODO
71===================================================================
72--- git.orig/TODO 2015-01-24 00:41:20.134716451 -0800
73+++ git/TODO 2015-01-24 00:41:20.126716451 -0800
74@@ -111,8 +111,6 @@
75
76 * Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
77
78-* the resolv.conf tmpfiles line should be covered by ENABLE_NETWORKD...
79-
80 * Add a new verb "systemctl top"
81
82 * logind: allow users to kill or lock their own sessions
83Index: git/configure.ac
84===================================================================
85--- git.orig/configure.ac 2015-01-24 00:41:20.134716451 -0800
86+++ git/configure.ac 2015-01-24 00:41:20.126716451 -0800
87@@ -1041,6 +1041,7 @@
88 AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
89 if test "x$enable_resolved" != "xno"; then
90 have_resolved=yes
91+ M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
92 fi
93 AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
94
95Index: git/tmpfiles.d/.gitignore
96===================================================================
97--- /dev/null 1970-01-01 00:00:00.000000000 +0000
98+++ git/tmpfiles.d/.gitignore 2015-01-24 00:41:20.126716451 -0800
99@@ -0,0 +1 @@
100+etc.conf
101Index: git/tmpfiles.d/etc.conf
102===================================================================
103--- git.orig/tmpfiles.d/etc.conf 2015-01-24 00:41:20.134716451 -0800
104+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
105@@ -1,15 +0,0 @@
106-# This file is part of systemd.
107-#
108-# systemd is free software; you can redistribute it and/or modify it
109-# under the terms of the GNU Lesser General Public License as published by
110-# the Free Software Foundation; either version 2.1 of the License, or
111-# (at your option) any later version.
112-
113-# See tmpfiles.d(5) for details
114-
115-L /etc/os-release - - - - ../usr/lib/os-release
116-L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
117-L+ /etc/mtab - - - - ../proc/self/mounts
118-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
119-C /etc/nsswitch.conf - - - -
120-C /etc/pam.d - - - -
121Index: git/tmpfiles.d/etc.conf.m4
122===================================================================
123--- /dev/null 1970-01-01 00:00:00.000000000 +0000
124+++ git/tmpfiles.d/etc.conf.m4 2015-01-24 00:41:20.126716451 -0800
125@@ -0,0 +1,17 @@
126+# This file is part of systemd.
127+#
128+# systemd is free software; you can redistribute it and/or modify it
129+# under the terms of the GNU Lesser General Public License as published by
130+# the Free Software Foundation; either version 2.1 of the License, or
131+# (at your option) any later version.
132+
133+# See tmpfiles.d(5) for details
134+
135+L /etc/os-release - - - - ../usr/lib/os-release
136+L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
137+L+ /etc/mtab - - - - ../proc/self/mounts
138+m4_ifdef(`ENABLE_RESOLVED',
139+L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
140+)
141+C /etc/nsswitch.conf - - - -
142+C /etc/pam.d - - - -
diff --git a/meta/recipes-core/systemd/systemd/binfmt-install.patch b/meta/recipes-core/systemd/systemd/binfmt-install.patch
index c2d5099f24..93b8e3cf3a 100644
--- a/meta/recipes-core/systemd/systemd/binfmt-install.patch
+++ b/meta/recipes-core/systemd/systemd/binfmt-install.patch
@@ -9,11 +9,11 @@ however can do that in a postinst.
9Upstream-Status: Denied 9Upstream-Status: Denied
10Signed-off-by: Ross Burton <ross.burton@intel.com> 10Signed-off-by: Ross Burton <ross.burton@intel.com>
11 11
12diff --git a/Makefile.am b/Makefile.am 12Index: git/Makefile.am
13index 7933de6..78acb6f 100644 13===================================================================
14--- a/Makefile.am 14--- git.orig/Makefile.am
15+++ b/Makefile.am 15+++ git/Makefile.am
16@@ -3133,10 +3133,6 @@ INSTALL_DIRS += \ 16@@ -4495,10 +4495,6 @@
17 $(prefix)/lib/binfmt.d \ 17 $(prefix)/lib/binfmt.d \
18 $(sysconfdir)/binfmt.d 18 $(sysconfdir)/binfmt.d
19 19
@@ -24,30 +24,31 @@ index 7933de6..78acb6f 100644
24 endif 24 endif
25 25
26 EXTRA_DIST += \ 26 EXTRA_DIST += \
27diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 27Index: git/units/proc-sys-fs-binfmt_misc.automount
28index 6be3893..709adef 100644 28===================================================================
29--- a/units/proc-sys-fs-binfmt_misc.automount 29--- git.orig/units/proc-sys-fs-binfmt_misc.automount
30+++ b/units/proc-sys-fs-binfmt_misc.automount 30+++ git/units/proc-sys-fs-binfmt_misc.automount
31@@ -16,3 +16,6 @@ ConditionPathIsReadWrite=/proc/sys/ 31@@ -16,3 +16,6 @@
32 32
33 [Automount] 33 [Automount]
34 Where=/proc/sys/fs/binfmt_misc 34 Where=/proc/sys/fs/binfmt_misc
35+ 35+
36+[Install] 36+[Install]
37+WantedBy=sysinit.target 37+WantedBy=sysinit.target
38diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 38Index: git/units/systemd-binfmt.service.in
39index 02dfe77..86d3481 100644 39===================================================================
40--- a/units/systemd-binfmt.service.in 40--- git.orig/units/systemd-binfmt.service.in
41+++ b/units/systemd-binfmt.service.in 41+++ git/units/systemd-binfmt.service.in
42@@ -11,6 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) 42@@ -11,6 +11,8 @@
43 Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt 43 Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
44 DefaultDependencies=no 44 DefaultDependencies=no
45 Conflicts=shutdown.target 45 Conflicts=shutdown.target
46+Wants=proc-sys-fs-binfmt_misc.automount 46+Wants=proc-sys-fs-binfmt_misc.automount
47 After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount 47+
48 After=proc-sys-fs-binfmt_misc.automount
48 Before=sysinit.target shutdown.target 49 Before=sysinit.target shutdown.target
49 ConditionPathIsReadWrite=/proc/sys/ 50 ConditionPathIsReadWrite=/proc/sys/
50@@ -24,3 +25,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d 51@@ -24,3 +26,6 @@
51 Type=oneshot 52 Type=oneshot
52 RemainAfterExit=yes 53 RemainAfterExit=yes
53 ExecStart=@rootlibexecdir@/systemd-binfmt 54 ExecStart=@rootlibexecdir@/systemd-binfmt
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
index f8e19ce172..28a9a3491f 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
@@ -9,11 +9,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9 src/journal/journald-kmsg.c | 16 ++++++++++++++-- 9 src/journal/journald-kmsg.c | 16 ++++++++++++++--
10 2 files changed, 29 insertions(+), 3 deletions(-) 10 2 files changed, 29 insertions(+), 3 deletions(-)
11 11
12diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c 12Index: git/src/journal/journal-file.c
13index f2f1f35..092f87b 100644 13===================================================================
14--- a/src/journal/journal-file.c 14--- git.orig/src/journal/journal-file.c
15+++ b/src/journal/journal-file.c 15+++ git/src/journal/journal-file.c
16@@ -38,6 +38,8 @@ 16@@ -35,6 +35,8 @@
17 #include "compress.h" 17 #include "compress.h"
18 #include "fsprg.h" 18 #include "fsprg.h"
19 19
@@ -22,7 +22,7 @@ index f2f1f35..092f87b 100644
22 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) 22 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
23 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) 23 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
24 24
25@@ -314,7 +316,7 @@ static int journal_file_verify_header(JournalFile *f) { 25@@ -314,7 +316,7 @@ static int journal_file_verify_header(Jo
26 26
27 static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { 27 static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
28 uint64_t old_size, new_size; 28 uint64_t old_size, new_size;
@@ -31,7 +31,7 @@ index f2f1f35..092f87b 100644
31 31
32 assert(f); 32 assert(f);
33 33
34@@ -362,9 +364,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) 34@@ -362,9 +364,21 @@ static int journal_file_allocate(Journal
35 /* Note that the glibc fallocate() fallback is very 35 /* Note that the glibc fallocate() fallback is very
36 inefficient, hence we try to minimize the allocation area 36 inefficient, hence we try to minimize the allocation area
37 as we can. */ 37 as we can. */
@@ -53,10 +53,10 @@ index f2f1f35..092f87b 100644
53 53
54 if (fstat(f->fd, &f->last_stat) < 0) 54 if (fstat(f->fd, &f->last_stat) < 0)
55 return -errno; 55 return -errno;
56diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c 56Index: git/src/journal/journald-kmsg.c
57index 12992e7..dc4fa93 100644 57===================================================================
58--- a/src/journal/journald-kmsg.c 58--- git.orig/src/journal/journald-kmsg.c
59+++ b/src/journal/journald-kmsg.c 59+++ git/src/journal/journald-kmsg.c
60@@ -437,6 +437,7 @@ fail: 60@@ -437,6 +437,7 @@ fail:
61 int server_open_kernel_seqnum(Server *s) { 61 int server_open_kernel_seqnum(Server *s) {
62 _cleanup_close_ int fd; 62 _cleanup_close_ int fd;
@@ -65,28 +65,24 @@ index 12992e7..dc4fa93 100644
65 65
66 assert(s); 66 assert(s);
67 67
68@@ -449,8 +450,19 @@ int server_open_kernel_seqnum(Server *s) { 68@@ -450,7 +451,19 @@ int server_open_kernel_seqnum(Server *s)
69 log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");
70 return 0; 69 return 0;
71 } 70 }
72- 71
73- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { 72- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) {
74+#ifdef HAVE_POSIX_FALLOCATE 73+#ifdef HAVE_POSIX_FALLOCATE
75+ r = posix_fallocate(fd, 0, sizeof(uint64_t)); 74+ r = posix_fallocate(fd, 0, sizeof(uint64_t));
76+#else 75+#else
77+ /* Use good old method to write zeros into the journal file 76+ /* Use good old method to write zeros into the journal file
78+ perhaps very inefficient yet working. */ 77+ perhaps very inefficient yet working. */
79+ char *buf = alloca(sizeof(uint64_t)); 78+ char *buf = alloca(sizeof(uint64_t));
80+ off_t oldpos = lseek(fd, 0, SEEK_CUR); 79+ off_t oldpos = lseek(fd, 0, SEEK_CUR);
81+ bzero(buf, sizeof(uint64_t)); 80+ bzero(buf, sizeof(uint64_t));
82+ lseek(fd, 0, SEEK_SET); 81+ lseek(fd, 0, SEEK_SET);
83+ r = write(fd, buf, sizeof(uint64_t)); 82+ r = write(fd, buf, sizeof(uint64_t));
84+ lseek(fd, oldpos, SEEK_SET); 83+ lseek(fd, oldpos, SEEK_SET);
85+#endif /* HAVE_POSIX_FALLOCATE */ 84+#endif /* HAVE_POSIX_FALLOCATE */
86+ if (r < 0) { 85+ if (r < 0) {
87 log_error("Failed to allocate sequential number file, ignoring: %m"); 86 log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m");
88 return 0; 87 return 0;
89 } 88 }
90--
911.7.9.5
92
diff --git a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch b/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
deleted file mode 100644
index 15645dee11..0000000000
--- a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Dont include sys/sysinfo.h on uclibc it conflicts with linux/sysinfo.h
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Inappropriate [uclibc specific]
5
6Index: systemd-209/src/readahead/readahead-common.c
7===================================================================
8--- systemd-209.orig/src/readahead/readahead-common.c 2014-02-12 18:42:33.810685053 -0800
9+++ systemd-209/src/readahead/readahead-common.c 2014-02-19 23:49:31.856661142 -0800
10@@ -22,7 +22,9 @@
11 #include <errno.h>
12 #include <stdlib.h>
13 #include <string.h>
14+#ifndef __UCLIBC__
15 #include <sys/sysinfo.h>
16+#endif
17 #include <sys/inotify.h>
18 #include <fcntl.h>
19 #include <sys/mman.h>
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_218.bb
index 569e88c240..221c2cc75a 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_218.bb
@@ -1,6 +1,15 @@
1SUMMARY = "System and service manager for Linux, replacing SysVinit" 1SUMMARY = "A System and service manager"
2HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" 2HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
3 3
4DESCRIPTION = "systemd is a system and service manager for Linux, compatible with \
5SysV and LSB init scripts. systemd provides aggressive parallelization \
6capabilities, uses socket and D-Bus activation for starting services, \
7offers on-demand starting of daemons, keeps track of processes using \
8Linux cgroups, supports snapshotting and restoring of the system \
9state, maintains mount and automount points and implements an \
10elaborate transactional dependency-based service control logic. It can \
11work as a drop-in replacement for sysvinit."
12
4LICENSE = "GPLv2 & LGPLv2.1 & MIT" 13LICENSE = "GPLv2 & LGPLv2.1 & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
6 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
@@ -10,16 +19,16 @@ PROVIDES = "udev"
10 19
11PE = "1" 20PE = "1"
12 21
13DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native" 22DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
14DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 23DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15 24
16SECTION = "base/shell" 25SECTION = "base/shell"
17 26
18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext 27inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
19 28
20SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b" 29SRCREV = "820aced6f6067a6b7c57b7d36e44f64378870cbf"
21 30
22PV = "216+git${SRCPV}" 31PV = "218+git${SRCPV}"
23 32
24SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ 33SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
25 file://binfmt-install.patch \ 34 file://binfmt-install.patch \
@@ -28,16 +37,10 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
28 file://systemd-pam-fix-fallocate.patch \ 37 file://systemd-pam-fix-fallocate.patch \
29 file://systemd-pam-fix-mkostemp.patch \ 38 file://systemd-pam-fix-mkostemp.patch \
30 file://optional_secure_getenv.patch \ 39 file://optional_secure_getenv.patch \
31 file://uclibc-sysinfo_h.patch \
32 file://uclibc-get-physmem.patch \ 40 file://uclibc-get-physmem.patch \
33 file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \ 41 file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \
34 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
35 file://0001-Make-root-s-home-directory-configurable.patch \ 42 file://0001-Make-root-s-home-directory-configurable.patch \
36 file://0001-systemd-user-avoid-using-system-auth.patch \ 43 file://0001-systemd-user-avoid-using-system-auth.patch \
37 file://0001-journal-Fix-navigating-backwards-missing-entries.patch \
38 file://0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch \
39 file://0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch \
40 file://0001-build-sys-configure-the-list-of-system-users-files-a.patch \
41 file://touchscreen.rules \ 44 file://touchscreen.rules \
42 file://00-create-volatile.conf \ 45 file://00-create-volatile.conf \
43 file://init \ 46 file://init \
@@ -90,8 +93,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
90 --enable-split-usr \ 93 --enable-split-usr \
91 --without-python \ 94 --without-python \
92 --with-sysvrcnd-path=${sysconfdir} \ 95 --with-sysvrcnd-path=${sysconfdir} \
93 --with-firmware-path=/lib/firmware \
94 ac_cv_path_KILL=${base_bindir}/kill \
95 " 96 "
96# uclibc does not have NSS 97# uclibc does not have NSS
97EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " 98EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
@@ -309,14 +310,7 @@ FILES_udev += "${base_sbindir}/udevd \
309 ${rootlibexecdir}/udev/scsi_id \ 310 ${rootlibexecdir}/udev/scsi_id \
310 ${rootlibexecdir}/udev/v4l_id \ 311 ${rootlibexecdir}/udev/v4l_id \
311 ${rootlibexecdir}/udev/keymaps \ 312 ${rootlibexecdir}/udev/keymaps \
312 ${rootlibexecdir}/udev/rules.d/4*.rules \ 313 ${rootlibexecdir}/udev/rules.d/*.rules \
313 ${rootlibexecdir}/udev/rules.d/5*.rules \
314 ${rootlibexecdir}/udev/rules.d/6*.rules \
315 ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \
316 ${rootlibexecdir}/udev/rules.d/75*.rules \
317 ${rootlibexecdir}/udev/rules.d/78*.rules \
318 ${rootlibexecdir}/udev/rules.d/8*.rules \
319 ${rootlibexecdir}/udev/rules.d/95*.rules \
320 ${sysconfdir}/udev \ 314 ${sysconfdir}/udev \
321 ${sysconfdir}/init.d/systemd-udevd \ 315 ${sysconfdir}/init.d/systemd-udevd \
322 ${systemd_unitdir}/system/*udev* \ 316 ${systemd_unitdir}/system/*udev* \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 07:13:17 +0000