Skip to contentSkip to conversation

plymouth: disable systemd-integration for sysvinit

PATCH New kai 1 participant 1 message May 25, 2020

lore
Share & tools
lore

kai

author
#0 lore raw

PATCH 1/1 plymouth: disable systemd-integration for sysvinit

From: Kai Kang <[email protected]>

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.

---
 meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb +1 -1
index 8b71c2bd6..78c1cb444 100644
@@ -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)} \
 "
 
Signature · 1 line
2.17.1