diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd_244.3.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index c5c0ce4bad..287f07b29f 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb | |||
@@ -82,6 +82,7 @@ PACKAGECONFIG ??= " \ | |||
82 | set-time-epoch \ | 82 | set-time-epoch \ |
83 | smack \ | 83 | smack \ |
84 | sysusers \ | 84 | sysusers \ |
85 | sysvinit \ | ||
85 | timedated \ | 86 | timedated \ |
86 | timesyncd \ | 87 | timesyncd \ |
87 | utmp \ | 88 | utmp \ |
@@ -165,6 +166,7 @@ PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" | |||
165 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" | 166 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" |
166 | PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" | 167 | PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" |
167 | PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" | 168 | PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" |
169 | PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,update-rc.d" | ||
168 | # When enabled use reproducble build timestamp if set as time epoch, | 170 | # When enabled use reproducble build timestamp if set as time epoch, |
169 | # or build time if not. When disabled, time epoch is unset. | 171 | # or build time if not. When disabled, time epoch is unset. |
170 | def build_epoch(d): | 172 | def build_epoch(d): |
@@ -198,7 +200,6 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ | |||
198 | -Dnobody-group=nobody \ | 200 | -Dnobody-group=nobody \ |
199 | -Drootlibdir=${rootlibdir} \ | 201 | -Drootlibdir=${rootlibdir} \ |
200 | -Drootprefix=${rootprefix} \ | 202 | -Drootprefix=${rootprefix} \ |
201 | -Dsysvrcnd-path=${sysconfdir} \ | ||
202 | -Ddefault-locale=C \ | 203 | -Ddefault-locale=C \ |
203 | " | 204 | " |
204 | 205 | ||
@@ -234,6 +235,7 @@ do_install() { | |||
234 | install -d ${D}${sysconfdir}/init.d | 235 | install -d ${D}${sysconfdir}/init.d |
235 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd | 236 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd |
236 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd | 237 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd |
238 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install | ||
237 | fi | 239 | fi |
238 | 240 | ||
239 | chown root:systemd-journal ${D}/${localstatedir}/log/journal | 241 | chown root:systemd-journal ${D}/${localstatedir}/log/journal |
@@ -273,7 +275,6 @@ do_install() { | |||
273 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf | 275 | sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf |
274 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd | 276 | ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd |
275 | fi | 277 | fi |
276 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install | ||
277 | 278 | ||
278 | # If polkit is setup fixup permissions and ownership | 279 | # If polkit is setup fixup permissions and ownership |
279 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then | 280 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then |
@@ -564,7 +565,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $ | |||
564 | 565 | ||
565 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" | 566 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" |
566 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" | 567 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" |
567 | RDEPENDS_${PN} += "volatile-binds update-rc.d" | 568 | RDEPENDS_${PN} += "volatile-binds" |
568 | 569 | ||
569 | RRECOMMENDS_${PN} += "systemd-extra-utils \ | 570 | RRECOMMENDS_${PN} += "systemd-extra-utils \ |
570 | systemd-compat-units udev-hwdb \ | 571 | systemd-compat-units udev-hwdb \ |