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

[mayosemmel]

Und applied...

Jan
Am Samstag, den 20.08.2016, 16:58 +0200 schrieb Tim Niemeyer:
> Hi
> 
> Auch von mir:
> 
> Reviewed-by: Tim Niemeyer <tim at tn-x.org>
> 
> Tim
> 
> Am Freitag, den 05.08.2016, 20:11 +0200 schrieb mayosemmel:
> > Reviewed-by: Jan Kraus <mayosemmel at gmail.com>
> > 
> > Am Montag, den 18.07.2016, 19:27 +0200 schrieb Steffen Pankratz:
> > > Signed-off-by: Steffen Pankratz <kratz00 at 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 at freifunk.net
> > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
> 


-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 473 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160820/64562865/attachment.sig>