Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC PATCH v4 2/2] apply-patches.sh check if they are rejects before applying patches
Date: Thu, 19 Jan 2012 23:26:45 +0100	[thread overview]
Message-ID: <201201192326.46203.arnout@mind.be> (raw)
In-Reply-To: <c170b553688aa9cf430f99b35f7a7d02481f4474.1326218007.git.ludovic.desroches@atmel.com>

 Short commit message should be:
apply-patches.sh: check if there are rejects before applying patches

On Tuesday 10 January 2012 19:01:56 ludovic.desroches at atmel.com wrote:
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
> 
> If we don't do it, the rejects' check at the end of the script can complain
> about rejects not deleted by the user from a previous try.
> 
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Since this patch is much more likely to go in on the short term, I would
reverse the order of the patches.  That means: revert builddir to targetdir.

> ---
>  support/scripts/apply-patches.sh |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
> index 2a25606..a15b5c1 100755
> --- a/support/scripts/apply-patches.sh
> +++ b/support/scripts/apply-patches.sh
> @@ -64,6 +64,13 @@ if [ ! -d "${builddir}" ] ; then
>  	echo "Aborting: ${builddir} 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 buildir
> +if [ "`find ${builddir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
> +    echo "There are remaining rejecting file into ${buildir}, please delete them"
 Should be:
echo "There are remaining reject files in '${buildir}', please delete them."

 Otherwise, looks perfect.

 Regards,
 Arnout

-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

  reply	other threads:[~2012-01-19 22:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-07  9:32 [Buildroot] Patching method Ludovic Desroches
2011-05-18 10:10 ` [Buildroot] [PATCH 1/1] kernel-patch.sh: script changed to support archives in a proper way Ludovic Desroches
     [not found]   ` <4DDBBB89.2020301@atmel.com>
2011-05-24 14:25     ` Peter Korsgaard
2011-05-24 14:50       ` Thomas Petazzoni
2011-06-29  9:12   ` [Buildroot] [RFC PATCH v2]kernel-patch.sh: " ludovic.desroches at atmel.com
2011-06-29  9:12     ` [Buildroot] [RFC PATCH v2 1/1] kernel-patch.sh: " ludovic.desroches at atmel.com
2011-06-29 10:42       ` Michael S. Zick
2011-06-29 13:21         ` Ludovic Desroches
2012-01-06 12:47         ` [Buildroot] [RFC PATCH v3]kernel-patch.sh: " ludovic.desroches at atmel.com
2012-01-06 12:47           ` [Buildroot] [RFC PATCH v3 1/2] apply-patches.sh: " ludovic.desroches at atmel.com
2012-01-09  9:45             ` Thomas De Schampheleire
2012-01-10 10:31               ` Ludovic Desroches
2012-01-10 11:46                 ` Thomas De Schampheleire
2012-01-10 18:01                   ` [Buildroot] [RFC PATCH v4]kernel-patch.sh: " ludovic.desroches at atmel.com
2012-01-10 18:01                     ` [Buildroot] [RFC PATCH v4 1/2] apply-patches.sh: " ludovic.desroches at atmel.com
2012-01-19 22:21                       ` Arnout Vandecappelle
2012-01-23  8:22                         ` Ludovic Desroches
2012-01-29 16:28                         ` Ludovic Desroches
2012-01-31  6:59                           ` Arnout Vandecappelle
2012-01-10 18:01                     ` [Buildroot] [RFC PATCH v4 2/2] apply-patches.sh check if they are rejects before applying patches ludovic.desroches at atmel.com
2012-01-19 22:26                       ` Arnout Vandecappelle [this message]
2012-01-06 12:47           ` [Buildroot] [RFC PATCH v3 " ludovic.desroches at atmel.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201201192326.46203.arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox