[Buildroot] [RFC PATCH v2 1/6] apply-patches.sh: check if there are rejects before applying patches
ludovic.desroches at atmel.com
ludovic.desroches at atmel.com
Wed Feb 15 22:33:49 UTC 2012
From: Ludovic Desroches <ludovic.desroches at atmel.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches at atmel.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
support/scripts/apply-patches.sh | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 1aef47e..b145b46 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -19,6 +19,13 @@ if [ ! -d "${patchdir}" ] ; then
echo "Aborting. '${patchdir}' is not a directory."
exit 1
fi
+
+# Check for rejects because if there are some, even if patches are well
+# applied, at the end it will complain about rejects into targetdir.
+if [ "`find ${targetdir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
+ rm -f "${targetdir}/*.rej" 2> /dev/null
+ echo "Remaining reject files in ${targetdir} have been removed"
+fi
for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do
apply="patch -g0 -p1 -E -d"
--
1.7.5.4
More information about the buildroot
mailing list