From bed3c48a0a8bc3d32f84f580f2949e86a8d135b7 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 23 Apr 2020 15:12:08 +0100 Subject: systemd: Drop RDEPEND on systemd-compat-units when sysvinit is disabled When sysvinit is disabled we have no init script support, so systemd-compat-units serves no purpose. Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_244.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb index 341ac6bbc5..7ab01fb8ce 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_244.3.bb @@ -163,7 +163,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" +PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units 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): @@ -567,7 +567,7 @@ RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator RDEPENDS_${PN} += "volatile-binds" RRECOMMENDS_${PN} += "systemd-extra-utils \ - systemd-compat-units udev-hwdb \ + udev-hwdb \ e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ os-release \ -- cgit 1.2.3-korg