]> code.ossystems Code Review - openembedded-core.git/commitdiff
modutils-initscripts: update postinst
authorChangqing Li <changqing.li@windriver.com>
Tue, 30 Jun 2020 09:49:16 +0000 (17:49 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 30 Jun 2020 22:02:11 +0000 (23:02 +0100)
in container image, it don't have init system,
install package modutils-initscripts will report error:

+ systemctl mask modutils.service
/var/tmp/rpm-tmp.DYK3Pm: line 8: systemctl: command not found
%post(modutils-initscripts-1.0-r7.3.cortexa72): waitpid(823) rc 823 status 7f00
warning: %post(modutils-initscripts-1.0-r7.3.cortexa72) scriptlet failed, exit status 127

fix by use same way as systemd.bbclass to decide if systemctl mask will run

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb

index 0f3df5577bdb7825ffde682e0d3d475e0e178508..881b7db92e5138a14623b3464f3e685748c4d61c 100644 (file)
@@ -24,7 +24,7 @@ do_install () {
 
 PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
 pkg_postinst_${PN} () {
-       if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+       if type systemctl >/dev/null 2>/dev/null; then
                if [ -n "$D" ]; then
                        OPTS="--root=$D"
                fi