From 02521a40d36d06d269ec14ce9000f2941d6980af Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Thu, 22 Aug 2013 12:56:46 +0300 Subject: [PATCH] busybox.inc: Avoid error when SYSLOG is not enabled Add -f to rm of ${D}${sysconfdir}/syslog-startup.conf.${BPN} so as to not error out when the busybox config used does not have SYSLOG enabled and DISTRO_FEATURES does not contain sysvinit. (From OE-Core rev: 4c5756149754d0b18b14595db335f8f5e14cc0a3) Signed-off-by: Florin Sarbu Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 8b38c1aaa8..454d7e3cbe 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -277,7 +277,7 @@ do_install () { # Remove the sysvinit specific configuration file for systemd systems to avoid confusion if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then - rm ${D}${sysconfdir}/syslog-startup.conf.${BPN} + rm -f ${D}${sysconfdir}/syslog-startup.conf.${BPN} fi }