[Buildroot] [RFC PATCH 1/6] apply-patches.sh: check if there are rejects before applying patches
Ludovic Desroches
ludovic.desroches at atmel.com
Wed Feb 15 16:55:57 UTC 2012
On Fri, Feb 10, 2012 at 10:43:18PM +0100, Arnout Vandecappelle wrote:
> On Monday 06 February 2012 02:47:14 ludovic.desroches at atmel.com wrote:
>
> > From: Ludovic Desroches <ludovic.desroches at atmel.com>
>
> >
>
> > Signed-off-by: Ludovic Desroches <ludovic.desroches at atmel.com>
>
> > Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
>
> > ---
>
> > support/scripts/apply-patches.sh | 6 ++++++
>
> > 1 files changed, 6 insertions(+), 0 deletions(-)
>
> >
>
> > diff --git a/support/scripts/apply-patches.sh
> b/support/scripts/apply-patches.sh
>
> > index 1aef47e..1ad7d1f 100755
>
> > --- a/support/scripts/apply-patches.sh
>
> > +++ b/support/scripts/apply-patches.sh
>
> > @@ -19,6 +19,12 @@ if [ ! -d "${patchdir}" ] ; then
>
> > echo "Aborting. '${patchdir}' is not a directory."
>
> > exit 1
>
> > fi
>
> > +
>
> > +# Check for rejects because if there are some, even if patches are
> well
>
> > +# applied, at the end it will complain about rejects into targetdir.
>
> > +if [ "`find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')'
> -print`" ] ; then
>
> > + echo "There are remaining reject files into ${targetdir}, please
> delete them."
>
> 'into' should be 'in'.
>
> Personally, I would just delete them instead of issuing a warning. If
> you
>
> don't then the script should at least exit at this point, otherwise
> you'll
>
> still get the complaint at the end.
>
Ok I'll change the behavior.
Regards
Ludovic
More information about the buildroot
mailing list