[1/1] buildscript: shortened firmware image file names

Submitted by Steffen Pankratz on July 18, 2016, 5:27 p.m.

Details

Message ID 20160718172734.4637-2-kratz00@gmx.de
State Accepted, archived
Commit 543d786c46a5371595d4a9781f277c079cf6c835
Headers show

Commit Message

Steffen Pankratz July 18, 2016, 5:27 p.m. 
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
---
 buildscript                                             | 8 ++++++++
 src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index ae75027..a24d87e 100755
--- a/buildscript
+++ b/buildscript
@@ -269,13 +269,21 @@  config() {
 }
 
 cp_firmware() {
+    if [ "$community" = "franken" ]; then
+        local community="fff"
+    fi
+
     for image in ${images[@]}; do
         filename_build=${image//openwrt/${community}-${version}}
+        filename_build=${filename_build//generic/g}
         cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
 
         image_factory=${image/sysupgrade/factory}
         if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
           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 be incompatibility with the stock firmware."
+          fi
           cp "$target/bin/${chipset}/$image_factory" "./bin/$filename_build_factory"
         fi
     done
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index e6bc7d9..cebe161 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -51,7 +51,11 @@  if [ $VERSION -eq $FIRMWARE_VERSION ]; then
   done
 fi
 
-FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-generic-${BOARD}-squashfs-sysupgrade.bin"
+if [ "$FIRMWARE_COMMUNITY" == "franken" ]; then
+    FIRMWARE_COMMUNITY="fff"
+fi
+
+FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
 echo -ne "Downloading $FILE\n\n"
 wget "${UPGRADE_PATH}/${FILE}"
 wget "${UPGRADE_PATH}/${FILE}.sha256"

Comments

Jan Kraus Aug. 5, 2016, 6:11 p.m. 
Reviewed-by: Jan Kraus <mayosemmel@gmail.com>

Am Montag, den 18.07.2016, 19:27 +0200 schrieb Steffen Pankratz:
> Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> ---
>  buildscript                                             | 8 ++++++++
>  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 6 +++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/buildscript b/buildscript
> index ae75027..a24d87e 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -269,13 +269,21 @@ config() {
>  }
>  
>  cp_firmware() {
> +    if [ "$community" = "franken" ]; then
> +        local community="fff"
> +    fi
> +
>      for image in ${images[@]}; do
>          filename_build=${image//openwrt/${community}-${version}}
> +        filename_build=${filename_build//generic/g}
>          cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
>  
>          image_factory=${image/sysupgrade/factory}
>          if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
>            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 be incompatibility with the stock firmware."
> +          fi
>            cp "$target/bin/${chipset}/$image_factory" "./bin/$filename_build_factory"
>          fi
>      done
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> index e6bc7d9..cebe161 100755
> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> @@ -51,7 +51,11 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then
>    done
>  fi
>  
> -FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-generic-${BOARD}-squashfs-sysupgrade.bin"
> +if [ "$FIRMWARE_COMMUNITY" == "franken" ]; then
> +    FIRMWARE_COMMUNITY="fff"
> +fi
> +
> +FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
>  echo -ne "Downloading $FILE\n\n"
>  wget "${UPGRADE_PATH}/${FILE}"
>  wget "${UPGRADE_PATH}/${FILE}.sha256"
> -- 
> 2.9.0
>
Tim Niemeyer Aug. 20, 2016, 2:58 p.m. 
Hi

Auch von mir:

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

Tim

Am Freitag, den 05.08.2016, 20:11 +0200 schrieb mayosemmel:
> Reviewed-by: Jan Kraus <mayosemmel@gmail.com>
> 
> Am Montag, den 18.07.2016, 19:27 +0200 schrieb Steffen Pankratz:
> > Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> > ---
> >  buildscript                                             | 8 ++++++++
> >  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 6 +++++-
> >  2 files changed, 13 insertions(+), 1 deletion(-)
> > 
> > diff --git a/buildscript b/buildscript
> > index ae75027..a24d87e 100755
> > --- a/buildscript
> > +++ b/buildscript
> > @@ -269,13 +269,21 @@ config() {
> >  }
> >  
> >  cp_firmware() {
> > +    if [ "$community" = "franken" ]; then
> > +        local community="fff"
> > +    fi
> > +
> >      for image in ${images[@]}; do
> >          filename_build=${image//openwrt/${community}-${version}}
> > +        filename_build=${filename_build//generic/g}
> >          cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
> >  
> >          image_factory=${image/sysupgrade/factory}
> >          if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
> >            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 be incompatibility with the stock firmware."
> > +          fi
> >            cp "$target/bin/${chipset}/$image_factory" "./bin/$filename_build_factory"
> >          fi
> >      done
> > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > index e6bc7d9..cebe161 100755
> > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > @@ -51,7 +51,11 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then
> >    done
> >  fi
> >  
> > -FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-generic-${BOARD}-squashfs-sysupgrade.bin"
> > +if [ "$FIRMWARE_COMMUNITY" == "franken" ]; then
> > +    FIRMWARE_COMMUNITY="fff"
> > +fi
> > +
> > +FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
> >  echo -ne "Downloading $FILE\n\n"
> >  wget "${UPGRADE_PATH}/${FILE}"
> >  wget "${UPGRADE_PATH}/${FILE}.sha256"
> > -- 
> > 2.9.0
> > 
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Jan Kraus Aug. 20, 2016, 3:23 p.m. 
Und applied...

Jan
Am Samstag, den 20.08.2016, 16:58 +0200 schrieb Tim Niemeyer:
> Hi
> 
> Auch von mir:
> 
> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> 
> Tim
> 
> Am Freitag, den 05.08.2016, 20:11 +0200 schrieb mayosemmel:
> > Reviewed-by: Jan Kraus <mayosemmel@gmail.com>
> > 
> > Am Montag, den 18.07.2016, 19:27 +0200 schrieb Steffen Pankratz:
> > > Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
> > > ---
> > >  buildscript                                             | 8 ++++++++
> > >  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 6 +++++-
> > >  2 files changed, 13 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/buildscript b/buildscript
> > > index ae75027..a24d87e 100755
> > > --- a/buildscript
> > > +++ b/buildscript
> > > @@ -269,13 +269,21 @@ config() {
> > >  }
> > >  
> > >  cp_firmware() {
> > > +    if [ "$community" = "franken" ]; then
> > > +        local community="fff"
> > > +    fi
> > > +
> > >      for image in ${images[@]}; do
> > >          filename_build=${image//openwrt/${community}-${version}}
> > > +        filename_build=${filename_build//generic/g}
> > >          cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
> > >  
> > >          image_factory=${image/sysupgrade/factory}
> > >          if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
> > >            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 be incompatibility with the stock firmware."
> > > +          fi
> > >            cp "$target/bin/${chipset}/$image_factory" "./bin/$filename_build_factory"
> > >          fi
> > >      done
> > > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > > index e6bc7d9..cebe161 100755
> > > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> > > @@ -51,7 +51,11 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then
> > >    done
> > >  fi
> > >  
> > > -FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-generic-${BOARD}-squashfs-sysupgrade.bin"
> > > +if [ "$FIRMWARE_COMMUNITY" == "franken" ]; then
> > > +    FIRMWARE_COMMUNITY="fff"
> > > +fi
> > > +
> > > +FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
> > >  echo -ne "Downloading $FILE\n\n"
> > >  wget "${UPGRADE_PATH}/${FILE}"
> > >  wget "${UPGRADE_PATH}/${FILE}.sha256"
> > > -- 
> > > 2.9.0
> > > 
> > 
> > -- 
> > franken-dev mailing list
> > franken-dev@freifunk.net
> > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>