diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2020-05-25 18:00:56 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-06-12 09:32:04 -0700 |
| commit | c664dd84170e225e2e7d753521b1dbbd79749c09 (patch) | |
| tree | 18efa519bc40eb5cba80bd096e6073290f2de64b /meta-oe | |
| parent | cc155826b0b4f202a8fa4ac103b7c38368d32734 (diff) | |
| download | meta-openembedded-contrib-c664dd84170e225e2e7d753521b1dbbd79749c09.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>
(cherry picked from commit 30b04053469415879a48ace9dec0f06aae92a1d8)
Signed-off-by: Armin Kuster <akuster808@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 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)} \ " |