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>
2012.11.x
Ludovic Desroches 2012-03-14 16:33:52 +01:00 committed by Peter Korsgaard
parent b593af83c0
commit 39bd61c6f3
1 changed files with 7 additions and 1 deletions

View File

@ -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=""