aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-05-25 18:00:56 +0800
committerKhem Raj <raj.khem@gmail.com>2020-05-26 10:28:39 -0700
commit30b04053469415879a48ace9dec0f06aae92a1d8 (patch)
tree8507eb33f2a96783f3dec5f093a4e45396c35685
parent713e70bd253310dcfa77709df163c7898bb401b3 (diff)
downloadmeta-openembedded-30b04053469415879a48ace9dec0f06aae92a1d8.tar.gz
plymouth: disable systemd-integration for sysvinit
It fails to build plymouth for sysvinit: | ERROR: plymouth-0.9.4-r0 do_package: QA Issue: plymouth: Files/directories were installed but not shipped in any package: | /poweroff.target.wants | ... | /halt.target.wants/plymouth-halt.service | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. | plymouth: 17 installed and not shipped files. [installed-vs-shipped] Because systemd is not installed for sysvinit, the value of variable 'SYSTEMD_UNIT_DIR' is empty and causes the failures. Disable systemd-integration if 'systemd' not in DISTRO_FEATURES. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
index 8b71c2bd6c..78c1cb4440 100644
--- a/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
+++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "4a197a4f1a05785d7453dd829b231352fb2d09171bd86c5ffaafbb2dd6
EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \
--with-logo=${LOGO} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '--disable-systemd-integration', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \
"