[Buildroot] [PATCH 1/6] apply-patches.sh: check if there are rejects before applying patches

Peter Korsgaard jacmet at uclibc.org
Wed Mar 14 22:32:05 UTC 2012


>>>>> "ludovic" == ludovic desroches <ludovic.desroches at atmel.com> writes:

 ludovic> From: Ludovic Desroches <ludovic.desroches at atmel.com>
 ludovic> Signed-off-by: Ludovic Desroches <ludovic.desroches at atmel.com>
 ludovic> Tested-by: Ludovic Desroches <ludovic.desroches at atmel.com>
 ludovic> with an armadeus_apf9328_defconfig build
 ludovic> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
 ludovic> ---
 ludovic>  support/scripts/apply-patches.sh |    7 +++++++
 ludovic>  1 files changed, 7 insertions(+), 0 deletions(-)

 ludovic> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
 ludovic> index 1aef47e..b145b46 100755
 ludovic> --- a/support/scripts/apply-patches.sh
 ludovic> +++ b/support/scripts/apply-patches.sh
 ludovic> @@ -19,6 +19,13 @@ if [ ! -d "${patchdir}" ] ; then
 ludovic>      echo "Aborting.  '${patchdir}' is not a directory."
 ludovic>      exit 1
 ludovic>  fi
 ludovic> +
 ludovic> +# Check for rejects because if there are some, even if patches are well
 ludovic> +# applied, at the end it will complain about rejects into targetdir.
 ludovic> +if [ "`find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
 ludovic> +	rm -f "${targetdir}/*.rej" 2> /dev/null

This is wrong, as the *.rej files might be in subdirs, so I changed this
to just do the find ... | xargs rm -f without notifying the user,
similar to how we do it for *.orig files. I also adjusted the comment
and commit message to match.

Committed with those changes, thanks.

-- 
Bye, Peter Korsgaard



More information about the buildroot mailing list