From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/6] apply-patches.sh: check if there are rejects before applying patches
Date: Wed, 14 Mar 2012 23:32:05 +0100 [thread overview]
Message-ID: <87aa3ike56.fsf@macbook.be.48ers.dk> (raw)
In-Reply-To: <1331739237-29872-2-git-send-email-ludovic.desroches@atmel.com> (ludovic desroches's message of "Wed, 14 Mar 2012 16:33:52 +0100")
>>>>> "ludovic" == ludovic desroches <ludovic.desroches@atmel.com> writes:
ludovic> From: Ludovic Desroches <ludovic.desroches@atmel.com>
ludovic> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
ludovic> Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
ludovic> with an armadeus_apf9328_defconfig build
ludovic> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@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
next prev parent reply other threads:[~2012-03-14 22:32 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-26 20:57 [Buildroot] [Bug 4796] New: apply-patches.sh reorders patches given on the command line bugzilla at busybox.net
2012-02-27 8:26 ` Ludovic Desroches
2012-02-27 12:54 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-28 21:19 ` Arnout Vandecappelle
2012-03-08 12:00 ` [Buildroot] [RFC] using series file ludovic.desroches at atmel.com
2012-03-08 12:00 ` [Buildroot] [PATCH] apply-patches.sh: use series file to apply patches in proper order ludovic.desroches at atmel.com
2012-03-08 10:48 ` Samuel Martin
2012-03-08 14:06 ` Ludovic Desroches
2012-03-08 15:50 ` Samuel Martin
2012-03-08 19:11 ` ludovic.desroches at atmel.com
2012-03-08 17:29 ` Samuel Martin
2012-03-12 8:57 ` Jean-Christophe PLAGNIOL-VILLARD
2012-03-13 10:08 ` Thomas De Schampheleire
2012-03-13 13:19 ` Jean-Christophe PLAGNIOL-VILLARD
2012-03-13 13:05 ` Julien Boibessot
2012-03-13 21:23 ` Ludovic Desroches
2012-03-14 8:59 ` Jean-Christophe PLAGNIOL-VILLARD
[not found] ` <4F606AF2.2010400@atmel.com>
2012-03-14 10:04 ` Thomas Petazzoni
2012-03-14 10:42 ` Ludovic Desroches
2012-03-14 11:03 ` Thomas Petazzoni
2012-03-14 15:33 ` ludovic.desroches at atmel.com
2012-03-14 15:33 ` [Buildroot] [PATCH 1/6] apply-patches.sh: check if there are rejects before applying patches ludovic.desroches at atmel.com
2012-03-14 21:41 ` Thomas Petazzoni
2012-03-14 22:32 ` Peter Korsgaard [this message]
2012-03-15 8:13 ` Ludovic Desroches
2012-03-14 15:33 ` [Buildroot] [PATCH 2/6] apply-patches.sh: rename targetdir to builddir ludovic.desroches at atmel.com
2012-03-14 21:42 ` Thomas Petazzoni
2012-03-20 22:50 ` Peter Korsgaard
2012-03-14 15:33 ` [Buildroot] [PATCH 3/6] apply-patches.sh: cleanup ludovic.desroches at atmel.com
2012-03-14 21:42 ` Thomas Petazzoni
2012-03-20 22:51 ` Peter Korsgaard
2012-03-14 15:33 ` [Buildroot] [PATCH 4/6] apply-patches.sh: directories are no more considered as overlays ludovic.desroches at atmel.com
2012-03-14 21:42 ` Thomas Petazzoni
2012-03-20 22:52 ` Peter Korsgaard
2012-03-14 15:33 ` [Buildroot] [PATCH 5/6] apply-patches.sh: change archive management ludovic.desroches at atmel.com
2012-03-14 21:43 ` Thomas Petazzoni
2012-03-15 8:27 ` Ludovic Desroches
2012-03-20 23:05 ` Peter Korsgaard
2012-03-14 15:33 ` [Buildroot] [PATCH 6/6] apply-patches.sh: use series file to apply patches in proper order ludovic.desroches at atmel.com
2012-03-14 21:43 ` Thomas Petazzoni
2012-03-20 23:07 ` Peter Korsgaard
2012-03-21 8:23 ` Ludovic Desroches
2012-03-21 9:02 ` Peter Korsgaard
2012-03-21 10:05 ` Ludovic Desroches
2012-03-21 13:26 ` ludovic.desroches at atmel.com
2012-03-21 12:26 ` Thomas Petazzoni
2012-03-21 13:02 ` Peter Korsgaard
2012-03-21 13:26 ` [Buildroot] [PATCH] apply-patches.sh: add recursivity when scanning patchdir ludovic.desroches at atmel.com
2012-03-21 12:48 ` Peter Korsgaard
2012-03-21 9:05 ` [Buildroot] [PATCH 6/6] apply-patches.sh: use series file to apply patches in proper order Thomas Petazzoni
2012-03-14 21:51 ` [Buildroot] [PATCH] " Thomas Petazzoni
2012-03-15 8:33 ` Ludovic Desroches
2012-03-15 10:46 ` [Buildroot] [Bug 4796] apply-patches.sh reorders patches given on the command line bugzilla at busybox.net
2012-03-15 10:46 ` bugzilla at busybox.net
2013-05-26 11:58 ` bugzilla at busybox.net
2013-05-26 12:31 ` bugzilla at busybox.net
2013-05-26 12:40 ` bugzilla at busybox.net
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=87aa3ike56.fsf@macbook.be.48ers.dk \
--to=jacmet@uclibc.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.