| Submitter | Ross Burton |
|---|---|
| Date | Oct. 25, 2012, 2:07 p.m. |
| Message ID | <1351174024-6300-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/38571/ |
| State | Accepted |
| Commit | becd38412a95f3f9f6c3450a87a7204be032d2e6 |
| Headers | show |
Comments
On 10/25/2012 07:07 AM, Ross Burton wrote: > 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> > --- > meta/recipes-extended/diffutils/diffutils_3.2.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb > index dc87190..400c8a6 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 > } > > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb index dc87190..400c8a6 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 }
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> --- meta/recipes-extended/diffutils/diffutils_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)