summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-06-30 17:49:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-07 23:15:10 +0100
commit1759605aed09c100f9149aa391357e499238d168 (patch)
tree49d1a21abe7fe1e9a367668cb12e7bf0c1738cf0 /meta/recipes-kernel
parent66a74f4bf9ec1121b704ddf20077cd25b73fb8cf (diff)
downloadpoky-1759605aed09c100f9149aa391357e499238d168.tar.gz
modutils-initscripts: update postinst
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 (From OE-Core rev: 922a668e769d3f51b0e8ec4949ae1936e9c59bc5) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit eec648f23df0a4e05130f8ef5a04902296567e38) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index 0f3df5577b..881b7db92e 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -24,7 +24,7 @@ do_install () {
24 24
25PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 25PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
26pkg_postinst_${PN} () { 26pkg_postinst_${PN} () {
27 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 27 if type systemctl >/dev/null 2>/dev/null; then
28 if [ -n "$D" ]; then 28 if [ -n "$D" ]; then
29 OPTS="--root=$D" 29 OPTS="--root=$D"
30 fi 30 fi