]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox.inc: Avoid error when SYSLOG is not enabled
authorFlorin Sarbu <florin.sarbu@windriver.com>
Thu, 22 Aug 2013 09:56:46 +0000 (12:56 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 22 Aug 2013 14:10:06 +0000 (15:10 +0100)
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/busybox/busybox.inc

index 8b38c1aaa825739e0226235b92eab0cf74cffdf8..454d7e3cbe255085cc5e657e033f0b8ff5052eb6 100644 (file)
@@ -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
 }