diff options
author | Kai Kang <kai.kang@windriver.com> | 2020-05-25 18:00:56 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-05-26 10:28:39 -0700 |
commit | 30b04053469415879a48ace9dec0f06aae92a1d8 (patch) | |
tree | 8507eb33f2a96783f3dec5f093a4e45396c35685 /meta-oe | |
parent | 713e70bd253310dcfa77709df163c7898bb401b3 (diff) | |
download | meta-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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-core/plymouth/plymouth_0.9.4.bb | 2 |
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 8b71c2bd6..78c1cb444 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 | |||
26 | 26 | ||
27 | EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ | 27 | EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ |
28 | --with-logo=${LOGO} \ | 28 | --with-logo=${LOGO} \ |
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent', '', d)} \ | 29 | ${@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)} \ |
30 | ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \ | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge','--without-system-root-install','--with-system-root-install',d)} \ |
31 | " | 31 | " |
32 | 32 | ||