aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-05-20 21:30:45 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-10-17 14:44:05 +0200
commit35c3a1e6937dc08157075027bf6219157510b2f9 (patch)
treea613e35f15e9483160a42fe9378f709325f531e2 /support
parent4b44d310e9dafc086dfff0a170277c5d06e8c593 (diff)
downloadbuildroot-35c3a1e6937dc08157075027bf6219157510b2f9.tar.gz
buildroot-35c3a1e6937dc08157075027bf6219157510b2f9.tar.bz2
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>
Diffstat (limited to 'support')
-rwxr-xr-xsupport/scripts/apply-patches.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 2d39d63da1..9fb488c570 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -113,8 +113,8 @@ function apply_patch {
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