Message ID | 20190422123537.5852-12-freifunk@adrianschmutzler.de |
---|---|
State | Deferred |
Headers | show |
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
Wenn dem so ist. Syntax passt. Reviewed-by: Robert Langhammer <rlanghammer@web.de> Am 22.04.19 um 14:35 schrieb Adrian Schmutzler: > This is required to support Fritzbox devices. > > Signed-off-by: Christian Dresel <fff@chrisi01.de> > [extracted from bigger patch] > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Reviewed-by: Christian Dresel <fff@chrisi01.de> > > --- > > Changes in v3: > - Moved from Fritz4040 changeset > - Added initial sign-off from Christian Dresel > --- > 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