[2/3] buildscript: Add support for eva firmware files

Submitted by Adrian Schmutzler on April 16, 2019, 9:42 p.m.

Details

Message ID 20190416214234.55480-3-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler April 16, 2019, 9:42 p.m. 
This is required to support Fritzbox devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 buildscript | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index d969c635..39a55ea7 100755
--- a/buildscript
+++ b/buildscript
@@ -279,10 +279,10 @@  cp_firmware() {
         filename_build=${filename_build//squashfs-/}
         cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
 
-        for region in "" "-eu" "-us"; do
-            image_factory=${image/sysupgrade/factory$region}
+        for factory in "factory" "factory-eu" "factory-us" "eva"; do
+            image_factory=${image/sysupgrade/$factory}
             if [[ -f "$target/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then
-              filename_build_factory=${filename_build/sysupgrade/factory$region}
+              filename_build_factory=${filename_build/sysupgrade/$factory}
               if [ ${#image_factory} -lt ${#filename_build_factory} ]; then
                 echo "Warning: The factory image file name (${filename_build_factory}) is longer than the OpenWrt one, which might lead to incompatibility with the stock firmware."
               fi

Comments

Christian Dresel April 22, 2019, 7:55 a.m. 
Reviewed-by: Christian Dresel <fff@chrisi01.de>

On 16.04.19 23:42, Adrian Schmutzler wrote:
> This is required to support Fritzbox devices.
>
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  buildscript | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/buildscript b/buildscript
> index d969c635..39a55ea7 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -279,10 +279,10 @@ cp_firmware() {
>          filename_build=${filename_build//squashfs-/}
>          cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
>  
> -        for region in "" "-eu" "-us"; do
> -            image_factory=${image/sysupgrade/factory$region}
> +        for factory in "factory" "factory-eu" "factory-us" "eva"; do
> +            image_factory=${image/sysupgrade/$factory}
>              if [[ -f "$target/bin/targets/${chipset}/${subtarget}/$image_factory" ]]; then
> -              filename_build_factory=${filename_build/sysupgrade/factory$region}
> +              filename_build_factory=${filename_build/sysupgrade/$factory}
>                if [ ${#image_factory} -lt ${#filename_build_factory} ]; then
>                  echo "Warning: The factory image file name (${filename_build_factory}) is longer than the OpenWrt one, which might lead to incompatibility with the stock firmware."
>                fi