Patchwork busybox.inc: Add -f to rm of ${D}${sysconfdir}/syslog-startup.conf.${BPN} to not error out when the busybox config used does not have SYSLOG enabled and DISTRO_FEATURES does not contain sysvinit.

login
register
mail settings
Submitter Florin Sarbu
Date Aug. 22, 2013, 9:56 a.m.
Message ID <1377165406-21978-1-git-send-email-florin.sarbu@windriver.com>
Download mbox | patch
Permalink /patch/56175/
State Accepted
Commit 4c5756149754d0b18b14595db335f8f5e14cc0a3
Headers show

Comments

Florin Sarbu - Aug. 22, 2013, 9:56 a.m.
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
---
 meta/recipes-core/busybox/busybox.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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
 }