summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-10-11 15:43:29 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 22:19:21 +0100
commitdf80b8107660d40000226d66f5c981f437f79325 (patch)
tree3e2110d3eef39c5d7038a382c11cb311d0cc7371
parent83e4e27246a33eccfc329086444eaa925ccb8499 (diff)
downloadpoky-df80b8107660d40000226d66f5c981f437f79325.tar.gz
sysklogd and busybox: ignore return code from init script stop
The init script will return '1' if we try to stop the service and it is not currently running. The prerm scriptlet must not fail because of this because it will cause package deinstallation of upgrade fail if opkg package manager is used. [YOCTO #10299] (From OE-Core rev: 806a910927f479207d47b06c20a0497e91203266) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index f67bbbc420..b2f1960226 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -423,7 +423,7 @@ pkg_prerm_${PN}-syslog () {
423 # remove syslog 423 # remove syslog
424 if test "x$D" = "x"; then 424 if test "x$D" = "x"; then
425 if test "$1" = "upgrade" -o "$1" = "remove"; then 425 if test "$1" = "upgrade" -o "$1" = "remove"; then
426 ${sysconfdir}/init.d/syslog stop 426 ${sysconfdir}/init.d/syslog stop || :
427 fi 427 fi
428 fi 428 fi
429} 429}
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1e363db6e8..5c15ffe8ab 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -55,7 +55,7 @@ ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
55pkg_prerm_${PN} () { 55pkg_prerm_${PN} () {
56 if test "x$D" = "x"; then 56 if test "x$D" = "x"; then
57 if test "$1" = "upgrade" -o "$1" = "remove"; then 57 if test "$1" = "upgrade" -o "$1" = "remove"; then
58 /etc/init.d/syslog stop 58 /etc/init.d/syslog stop || :
59 fi 59 fi
60 fi 60 fi
61} 61}