[master,v4] fix patching error by empty build_patches dir

Submitted by Jan-Tarek Butt on Sept. 10, 2016, 7:16 p.m.

Details

Message ID 20160910191616.768-1-tarek@ring0.de
State Superseded
Headers show

Commit Message

Jan-Tarek Butt Sept. 10, 2016, 7:16 p.m. 
---
 buildscript | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--
2.9.3

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 04942e6..9e50440 100755
--- a/buildscript
+++ b/buildscript
@@ -122,9 +122,11 @@  get_source() {
 }

 patch_target() {
-    for patch in "$PWD"/build_patches/openwrt/*.patch; do
-        patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
-    done
+    if [ "$(find "$PWD"/build_patches/lede/*.patch 2> /dev/null | wc -l)" -ge 1 ]; then
+        for patch in "$PWD"/build_patches/openwrt/*.patch; do
+            patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
+        done
+    fi
 }

 prepare() {

Comments

Jan-Tarek Butt Sept. 10, 2016, 7:59 p.m. 
>  patch_target() {
> -    for patch in "$PWD"/build_patches/openwrt/*.patch; do
> -        patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
> -    done
> +    if [ "$(find "$PWD"/build_patches/lede/*.patch 2> /dev/null | wc -l)" -ge 1 ]; then

Gnarf ich stelle mich gerade echt ein bisschen blöd an ...

vg
Tarek