summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd_237.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb
index e6336db0de..b1c976fc5b 100644
--- a/meta/recipes-core/systemd/systemd_237.bb
+++ b/meta/recipes-core/systemd/systemd_237.bb
@@ -82,7 +82,7 @@ PACKAGECONFIG ??= " \
82 polkit \ 82 polkit \
83 quotacheck \ 83 quotacheck \
84 randomseed \ 84 randomseed \
85 resolve \ 85 resolved \
86 smack \ 86 smack \
87 sysusers \ 87 sysusers \
88 timedated \ 88 timedated \
@@ -96,7 +96,7 @@ PACKAGECONFIG_remove_libc-musl = " \
96 localed \ 96 localed \
97 myhostname \ 97 myhostname \
98 nss \ 98 nss \
99 resolve \ 99 resolved \
100 selinux \ 100 selinux \
101 smack \ 101 smack \
102 sysusers \ 102 sysusers \
@@ -144,7 +144,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
144PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode" 144PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
145PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" 145PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false"
146PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" 146PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false"
147PACKAGECONFIG[resolve] = "-Dresolve=true,-Dresolve=false" 147PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false"
148PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false" 148PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false"
149# libseccomp is found in meta-security 149# libseccomp is found in meta-security
150PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" 150PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp"
@@ -247,7 +247,7 @@ do_install() {
247 if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then 247 if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
248 ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)} 248 ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
249 fi 249 fi
250 if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolve', 'true', 'false', d)}; then 250 if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then
251 echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf 251 echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
252 echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf 252 echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
253 echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf 253 echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
@@ -301,7 +301,7 @@ USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload',
301USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}" 301USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}"
302USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}" 302USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}"
303USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" 303USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
304USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolve', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" 304USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}"
305USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" 305USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}"
306GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" 306GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
307USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;" 307USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;"