[v1,2/3] buildscript: patch source before generating feeds

Submitted by Tim Niemeyer on July 1, 2017, 5:06 p.m.

Details

Message ID 1498928816-12109-2-git-send-email-tim@tn-x.org
State Superseded
Headers show

Commit Message

Tim Niemeyer July 1, 2017, 5:06 p.m.
.. otherwise the applied patches are not used while generating the
openwrt config.

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

 buildscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/buildscript b/buildscript
index afa77f8..c6af21e 100755
--- a/buildscript
+++ b/buildscript
@@ -135,6 +135,8 @@  prepare() {
     /bin/rm -rf "$target"
     cp -a src/openwrt "$target"
 
+    patch_target
+
     ## generate own feeds.conf
     #this local variable should be globally configure variable used in get_source and here
     local PACKAGEBASE=${PWD}/src/packages
@@ -166,8 +168,6 @@  prepare() {
         fi
     done
 
-    patch_target
-
     #saves ~200MB for each build
     test -d ./src/dl || mkdir ./src/dl
     ln -s ../../src/dl "$target"/dl

Comments

Christian Dresel July 2, 2017, 2:12 p.m.
Hi

danke fürs fixen, das hat mächtig genervt ;)

Reviewed-by: Christian Dresel <fff@chrisi01.de>

mfg

Christian

On 01.07.2017 19:06, Tim Niemeyer wrote:
> .. otherwise the applied patches are not used while generating the
> openwrt config.
> 
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
>  buildscript | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index afa77f8..c6af21e 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -135,6 +135,8 @@ prepare() {
>      /bin/rm -rf "$target"
>      cp -a src/openwrt "$target"
>  
> +    patch_target
> +
>      ## generate own feeds.conf
>      #this local variable should be globally configure variable used in get_source and here
>      local PACKAGEBASE=${PWD}/src/packages
> @@ -166,8 +168,6 @@ prepare() {
>          fi
>      done
>  
> -    patch_target
> -
>      #saves ~200MB for each build
>      test -d ./src/dl || mkdir ./src/dl
>      ln -s ../../src/dl "$target"/dl
>