From: Ross Burton <ross.burton@intel.com>
Date: Thu, 25 Oct 2012 14:07:04 +0000 (+0000)
Subject: diffutils: fix rebuilds
X-Git-Tag: 2015-4~8779
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=becd38412a95f3f9f6c3450a87a7204be032d2e6;p=openembedded-core.git

diffutils: fix rebuilds

If diffutils rebuilds it tries to remove with "rm" files that don't exist
anymore, resulting in an error.

Use rm -f so the removal always succeeds.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index dc8719089c..400c8a6b3f 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -6,7 +6,7 @@ require diffutils.inc
 do_configure_prepend () {
 	# Need to remove gettext macros with weird mix of versions
 	for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
-		rm ${S}/m4/$i
+		rm -f ${S}/m4/$i
 	done
 }