From 39ece7b3e604c9dfa046841e099e2a47b713f62c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Fri, 27 Mar 2020 17:25:13 +0000 Subject: systemd: Add PACKAGECONFIG for sysvinit Add sysvinit PACKAGECONFIG which disables all sysvinit handling in systemd if it isn't present. Consolidate sysvinit handling so that when it's disabled we exclude all sysvinit features. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 7 ++++--- 1 file 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 ??= " \ set-time-epoch \ smack \ sysusers \ + sysvinit \ timedated \ timesyncd \ utmp \ @@ -165,6 +166,7 @@ PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" +PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,update-rc.d" # When enabled use reproducble build timestamp if set as time epoch, # or build time if not. When disabled, time epoch is unset. def build_epoch(d): @@ -198,7 +200,6 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ -Dnobody-group=nobody \ -Drootlibdir=${rootlibdir} \ -Drootprefix=${rootprefix} \ - -Dsysvrcnd-path=${sysconfdir} \ -Ddefault-locale=C \ " @@ -234,6 +235,7 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd + install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install fi chown root:systemd-journal ${D}/${localstatedir}/log/journal @@ -273,7 +275,6 @@ do_install() { 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 ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd fi - install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install # If polkit is setup fixup permissions and ownership 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/ $ RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" -RDEPENDS_${PN} += "volatile-binds update-rc.d" +RDEPENDS_${PN} += "volatile-binds" RRECOMMENDS_${PN} += "systemd-extra-utils \ systemd-compat-units udev-hwdb \ -- cgit 1.2.3-korg