diff options
5 files changed, 384 insertions, 37 deletions
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 new file mode 100644 index 0000000000..e0043597a2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch | |||
| @@ -0,0 +1,176 @@ | |||
| 1 | From 5a16bc264c32237e38a844d55e7a1820a31b8440 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com> | ||
| 3 | Date: Fri, 28 Nov 2014 15:59:59 +0100 | ||
| 4 | Subject: [PATCH] build-sys: configure the list of system users, files and | ||
| 5 | directories | ||
| 6 | |||
| 7 | Choose which system users defined in sysusers.d/systemd.conf and files | ||
| 8 | or directories in tmpfiles.d/systemd.conf, should be provided depending | ||
| 9 | on comile-time configuration. | ||
| 10 | |||
| 11 | Upstream-Status: Backport | ||
| 12 | Signed-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 | |||
| 24 | Index: 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) < $< > $@ | ||
| 39 | Index: 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 | |||
| 59 | Index: 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" | ||
| 76 | Index: 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 | ||
| 101 | Index: 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 | ||
| 138 | Index: 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 new file mode 100644 index 0000000000..4795f8670f --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | From bedd083aaedb3bbb14ef579a047bf4b4fed56d9b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com> | ||
| 3 | Date: Wed, 26 Nov 2014 09:17:50 +0100 | ||
| 4 | Subject: [PATCH] build-sys: do not install tmpfiles and sysusers files by | ||
| 5 | default | ||
| 6 | |||
| 7 | Upstream-Status: Backport | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | --- | ||
| 12 | Makefile.am | 14 +++++++++++--- | ||
| 13 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/Makefile.am b/Makefile.am | ||
| 16 | index 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 | -- | ||
| 55 | 1.9.1 | ||
| 56 | |||
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 new file mode 100644 index 0000000000..b5b0168149 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch | |||
| @@ -0,0 +1,142 @@ | |||
| 1 | From aeb50ff0bd4bbbca74c4695072232348351d512d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tom Gundersen <teg@jklm.no> | ||
| 3 | Date: Wed, 27 Aug 2014 17:45:41 +0200 | ||
| 4 | Subject: [PATCH] tmpfiles: make resolv.conf entry conditional on resolved | ||
| 5 | support | ||
| 6 | |||
| 7 | Upstream-Status: Backport | ||
| 8 | Signed-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 | |||
| 20 | Index: 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 < $< > $@ | ||
| 70 | Index: 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 | ||
| 83 | Index: 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 | |||
| 95 | Index: 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 | ||
| 101 | Index: 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 - - - - | ||
| 121 | Index: 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/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch deleted file mode 100644 index 7218322d4c..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From f0ab1600fb56d680e6aba3d0d51dfb9ffa3d9403 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Peter A. Bigot" <pab@pabigot.com> | ||
| 3 | Date: Thu, 18 Sep 2014 08:36:54 -0500 | ||
| 4 | Subject: [PATCH] tmpfiles.d/etc.conf: disable resolv.conf symlink | ||
| 5 | |||
| 6 | This link is valid only if ENABLE_RESOLVED is configured for systemd. | ||
| 7 | If left unconditional, the symlink is created preventing connman from | ||
| 8 | storing the configuration it received from DHCP or other sources. | ||
| 9 | |||
| 10 | Upstream has a TODO to fix this, but has not done so as of this date. | ||
| 11 | Provide a temporary workaround for OE until this is done properly | ||
| 12 | upstream. | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [OE-specific] | ||
| 15 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
| 16 | --- | ||
| 17 | tmpfiles.d/etc.conf | 3 ++- | ||
| 18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf | ||
| 21 | index b23272c..5364dd8 100644 | ||
| 22 | --- a/tmpfiles.d/etc.conf | ||
| 23 | +++ b/tmpfiles.d/etc.conf | ||
| 24 | @@ -10,6 +10,7 @@ | ||
| 25 | L /etc/os-release - - - - ../usr/lib/os-release | ||
| 26 | L /etc/localtime - - - - ../usr/share/zoneinfo/UTC | ||
| 27 | L+ /etc/mtab - - - - ../proc/self/mounts | ||
| 28 | -L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf | ||
| 29 | +# TODO: conditional on ENABLE_RESOLVED | ||
| 30 | +#L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf | ||
| 31 | C /etc/nsswitch.conf - - - - | ||
| 32 | C /etc/pam.d - - - - | ||
| 33 | -- | ||
| 34 | 1.8.5.5 | ||
| 35 | |||
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index b49bd72e62..569e88c240 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb | |||
| @@ -35,11 +35,13 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= | |||
| 35 | file://0001-Make-root-s-home-directory-configurable.patch \ | 35 | file://0001-Make-root-s-home-directory-configurable.patch \ |
| 36 | file://0001-systemd-user-avoid-using-system-auth.patch \ | 36 | file://0001-systemd-user-avoid-using-system-auth.patch \ |
| 37 | file://0001-journal-Fix-navigating-backwards-missing-entries.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 \ | ||
| 38 | file://touchscreen.rules \ | 41 | file://touchscreen.rules \ |
| 39 | file://00-create-volatile.conf \ | 42 | file://00-create-volatile.conf \ |
| 40 | file://init \ | 43 | file://init \ |
| 41 | file://run-ptest \ | 44 | file://run-ptest \ |
| 42 | ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \ | ||
| 43 | " | 45 | " |
| 44 | 46 | ||
| 45 | S = "${WORKDIR}/git" | 47 | S = "${WORKDIR}/git" |
| @@ -151,6 +153,12 @@ do_install() { | |||
| 151 | 153 | ||
| 152 | # Enable journal to forward message to syslog daemon | 154 | # Enable journal to forward message to syslog daemon |
| 153 | sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf | 155 | sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf |
| 156 | # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d | ||
| 157 | # don't order journal flushing afte remote-fs.target | ||
| 158 | sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service | ||
| 159 | # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it | ||
| 160 | # for existence else it fails | ||
| 161 | ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} | ||
| 154 | } | 162 | } |
| 155 | 163 | ||
| 156 | do_install_ptest () { | 164 | do_install_ptest () { |
| @@ -182,7 +190,7 @@ SYSTEMD_PACKAGES = "${PN}-binfmt" | |||
| 182 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 190 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" |
| 183 | 191 | ||
| 184 | USERADD_PACKAGES = "${PN}" | 192 | USERADD_PACKAGES = "${PN}" |
| 185 | USERADD_PARAM_${PN} += "--system systemd-journal-gateway" | 193 | USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" |
| 186 | GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" | 194 | GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" |
| 187 | 195 | ||
| 188 | FILES_${PN}-analyze = "${bindir}/systemd-analyze" | 196 | FILES_${PN}-analyze = "${bindir}/systemd-analyze" |
