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>
This commit is contained in:
parent
b593af83c0
commit
39bd61c6f3
|
@ -20,6 +20,12 @@ if [ ! -d "${patchdir}" ] ; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
|
||||||
apply="patch -g0 -p1 -E -d"
|
apply="patch -g0 -p1 -E -d"
|
||||||
uncomp_parm=""
|
uncomp_parm=""
|
||||||
|
|
Loading…
Reference in a new issue