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:11:13 +0100 |
commit | 02521a40d36d06d269ec14ce9000f2941d6980af (patch) | |
tree | e4db2c67621485eb41f7f904c4665bc23d5be1f2 /meta | |
parent | 06f1ebf206911ffe223483da945189a287f20b7d (diff) | |
download | poky-02521a40d36d06d269ec14ce9000f2941d6980af.tar.gz |
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 <florin.sarbu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () { | |||
277 | 277 | ||
278 | # Remove the sysvinit specific configuration file for systemd systems to avoid confusion | 278 | # Remove the sysvinit specific configuration file for systemd systems to avoid confusion |
279 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then | 279 | if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then |
280 | rm ${D}${sysconfdir}/syslog-startup.conf.${BPN} | 280 | rm -f ${D}${sysconfdir}/syslog-startup.conf.${BPN} |
281 | fi | 281 | fi |
282 | } | 282 | } |
283 | 283 | ||