[oe-commits] Florin Sarbu : busybox.inc: Avoid error when SYSLOG is not enabled

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4c5756149754d0b18b14595db335f8f5e14cc0a3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4c5756149754d0b18b14595db335f8f5e14cc0a3

Author: Florin Sarbu <florin.sarbu at windriver.com>
Date:   Thu Aug 22 12:56:46 2013 +0300

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.

Signed-off-by: Florin Sarbu <florin.sarbu at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/busybox/busybox.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 8b38c1a..454d7e3 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
 }