diff options
author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-02-07 11:16:28 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-08 22:26:16 +0100 |
commit | 14cdf705c678d1ddb9705ea577a42b6b647f96c7 (patch) | |
tree | 7d93a4dd617c22118b75134ee42b1f5fc9a8d90c | |
parent | 6dd52bf8deb806fa52e154fa92b93f750160b019 (diff) | |
download | buildroot-14cdf705c678d1ddb9705ea577a42b6b647f96c7.tar.gz buildroot-14cdf705c678d1ddb9705ea577a42b6b647f96c7.zip |
apply-patches.sh: make scan_patchdir work recursively
scan_patchdir is called recursively. For this to work properly, the
variable path which is set to $1 at the very beginning must be local not
global.
A test case is to set BR2_GLOBAL_PATCH_DIR to 'mypatches' and having the
following tree in the buildroot root:
$ find mypatches/
mypatches/
mypatches/busybox
mypatches/busybox/subdir.patch
mypatches/busybox/subdir.patch/busybox-0001-abc.patch
mypatches/busybox/busybox-0002-def.patch
mypatches/busybox/asubdir.patch
mypatches/busybox/asubdir.patch/busybox-0003-xyz.patch
When running 'make busybox-dirclean busybox-patch' originally, you'd get:
Applying busybox-0003-xyz.patch using patch:
Applying busybox-0002-def.patch using patch:
Error: missing patch file
mypatches/busybox/asubdir.patch/busybox-0002-def.patch
While with this fix:
Applying busybox-0003-xyz.patch using patch:
Applying busybox-0002-def.patch using patch:
Applying busybox-0001-abc.patch using patch:
This fixes bug #6434 (https://bugs.busybox.net/show_bug.cgi?id=6434)
Signed-off-by: Daniel Mentz <daniel@exxm.de>
[Thomas: update commit message with test case]
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rwxr-xr-x | support/scripts/apply-patches.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index ff72b45240..37f2d810ce 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -92,7 +92,7 @@ function apply_patch { } function scan_patchdir { - path=$1 + local path=$1 shift 1 patches=${@-*} |