summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-04-23 15:12:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-26 14:00:50 +0100
commit543afac598d800d5654e1e572abd423e2451a6d1 (patch)
treee29caa9adb5c5898dfa8bed824aee3611e5140dc /meta/recipes-core
parent133e137f953b21dce2b2eb465468d778a689113b (diff)
downloadpoky-543afac598d800d5654e1e572abd423e2451a6d1.tar.gz
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. (From OE-Core rev: bed3c48a0a8bc3d32f84f580f2949e86a8d135b7) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd_244.3.bb4
1 files 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"
163PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell" 163PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell"
164PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" 164PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false"
165PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" 165PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false"
166PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,update-rc.d" 166PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units update-rc.d"
167# When enabled use reproducble build timestamp if set as time epoch, 167# When enabled use reproducble build timestamp if set as time epoch,
168# or build time if not. When disabled, time epoch is unset. 168# or build time if not. When disabled, time epoch is unset.
169def build_epoch(d): 169def build_epoch(d):
@@ -567,7 +567,7 @@ RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator
567RDEPENDS_${PN} += "volatile-binds" 567RDEPENDS_${PN} += "volatile-binds"
568 568
569RRECOMMENDS_${PN} += "systemd-extra-utils \ 569RRECOMMENDS_${PN} += "systemd-extra-utils \
570 systemd-compat-units udev-hwdb \ 570 udev-hwdb \
571 e2fsprogs-e2fsck \ 571 e2fsprogs-e2fsck \
572 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ 572 kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \
573 os-release \ 573 os-release \