diff options
| author | Florin Sarbu <florin.sarbu@windriver.com> | 2013-08-22 12:56:46 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 15:10:06 +0100 |
| commit | 4c5756149754d0b18b14595db335f8f5e14cc0a3 (patch) | |
| tree | 66217e2ffa839cf065812ed23ab3c48cab5fa0bf | |
| parent | d98f08a7ad95d0b17846276b028a6614f16b6846 (diff) | |
| download | openembedded-core-4c5756149754d0b18b14595db335f8f5e14cc0a3.tar.gz openembedded-core-4c5756149754d0b18b14595db335f8f5e14cc0a3.tar.bz2 openembedded-core-4c5756149754d0b18b14595db335f8f5e14cc0a3.zip | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | 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 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 } |