support/scripts/apply-patches.sh: manage uncompression
Extract from bug report:
"Code line 120 to line 128 is to check whether the patch containing
"rename from" and "rename to". But it directly use grep to find,
ignoring the patch may be a tar file or else. It can only work on patch
of textfile form."
Fixes:
- https://bugs.buildroot.org/show_bug.cgi?id=11931
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 2d39d63..9fb488c 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -113,8 +113,8 @@
echo " to be applied : ${path}/${patch}"
exit 1
fi
- if grep -q "^rename from" ${path}/${patch} && \
- grep -q "^rename to" ${path}/${patch} ; then
+ if ${uncomp} "${path}/$patch" | grep -q "^rename from" && \
+ ${uncomp} "${path}/$patch" | grep -q "^rename to" ; then
echo "Error: patch contains some renames, not supported by old patch versions"
exit 1
fi
