[Buildroot] [PATCH 1/1] support/scripts/apply-patches.sh: manage uncompression

[Buildroot] [PATCH 1/1] support/scripts/apply-patches.sh: manage uncompression

[Fabrice Fontaine]

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>
---
 support/scripts/apply-patches.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 66fef262ee..80e2264497 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
-- 
2.26.2

[Buildroot] [PATCH 1/1] support/scripts/apply-patches.sh: manage uncompression

[Thomas Petazzoni]

On Wed, 20 May 2020 21:30:45 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> 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>
> ---
>  support/scripts/apply-patches.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] support/scripts/apply-patches.sh: manage uncompression

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Wed, 20 May 2020 21:30:45 +0200
 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

 >> 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>
 >> ---
 >> support/scripts/apply-patches.sh | 4 ++--
 >> 1 file changed, 2 insertions(+), 2 deletions(-)

 > Applied to master, thanks.

Committed to 2020.02.x and 2020.08.x, thanks.

-- 
Bye, Peter Korsgaard