diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2012-03-14 16:33:52 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-14 23:28:57 +0100 |
| commit | 39bd61c6f30e3d9548b5928488fcd9ccfb3fda70 (patch) | |
| tree | 79fb3249d538dd041d05f69978d323e2bdbec879 | |
| parent | b593af83c0eece47899f0bf7871376e784b1f0cf (diff) | |
apply-patches.sh: remove any rejects before applying patches
[Peter: .rej files might be in subdirs, so just do find .. | xargs rm]
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rwxr-xr-x | support/scripts/apply-patches.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 1aef47ebf..e418cb6ec 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -19,7 +19,13 @@ if [ ! -d "${patchdir}" ] ; then echo "Aborting. '${patchdir}' is not a directory." exit 1 fi - + +# Remove any rejects present BEFORE patching - Because if there are +# any, even if patches are well applied, at the end it will complain +# about rejects in targetdir. +find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \ + xargs -0 -r rm -f + for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do apply="patch -g0 -p1 -E -d" uncomp_parm="" |