Commit 39bd61c6 authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Peter Korsgaard
Browse files

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: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
with an armadeus_apf9328_defconfig build
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b593af83

support/scripts/apply-patches.sh

+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ if [ ! -d "${patchdir}" ] ; then 
    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=""