[Alternative PATCH 5/7] fff-sysupgrade: Update sysupgrade.sh to support openwrt-18.06

[mail at adrianschmutzler.de]

Hallo,

die Version der fff-sysupgrade Package wie hier gleich am Anfang:

https://pw.freifunk-franken.de/patch/907/

-PKG_VERSION:=7
-PKG_RELEASE:=4
+PKG_VERSION:=8
+PKG_RELEASE:=1

Kannst auch das Release inkrementieren, wenn dir das lieber ist.

Grüße

Adrian

> -----Original Message-----
> From: Tim Niemeyer [mailto:tim at tn-x.org]
> Sent: Montag, 13. August 2018 07:33
> To: mail at adrianschmutzler.de; franken-dev at freifunk.net
> Subject: RE: [Alternative PATCH 5/7] fff-sysupgrade: Update sysupgrade.sh
> to support openwrt-18.06
> 
> Hi
> 
> Am 12. August 2018 21:36:41 MESZ schrieb mail at adrianschmutzler.de:
> >Hallo,
> >
> >ich würde die Version noch anpassen, ansonsten wäre der im Falle deiner
> 
> Welche Version meinst du?
> 
> Tim
> 
> 
> >Variante so review-fähig.
> >
> >Grüße
> >
> >Adrian
> >
> >> -----Original Message-----
> >> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On
> Behalf
> >> Of Tim Niemeyer
> >> Sent: Dienstag, 7. August 2018 07:09
> >> To: franken-dev at freifunk.net
> >> Subject: [Alternative PATCH 5/7] fff-sysupgrade: Update sysupgrade.sh
> >to
> >> support openwrt-18.06
> >>
> >> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> >> ---
> >>
> >>  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 14
> >+++++++++---
> >> --
> >>  1 file changed, 9 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> >> b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> >> index 6b6c10af..83aa418c 100755
> >> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> >> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> >> @@ -17,9 +17,13 @@ BOARD=$(uci get board.model.name)  #decide SOC
> >> case $BOARD in
> >>      tl-wdr4900-v1 )
> >> -        SOC="mpc85xx" ;;
> >> +        SOC="mpc85xx"
> >> +        SUBTARGET="g"
> >> +        ;;
> >>      * )
> >> -        SOC="ar71xx" ;;
> >> +        SOC="ar71xx"
> >> +        SUBTARGET="t"
> >> +        ;;
> >>  esac
> >>  echo ""
> >>  echo "Hardware: $BOARD"
> >> @@ -27,9 +31,9 @@ echo "Hardware: $BOARD"
> >>  #rewrite BOARD
> >>  case $BOARD in
> >>      cpe210 )
> >> -        BOARD="cpe210-220" ;;
> >> +        BOARD="cpe210-220-v1" ;;
> >>      cpe510 )
> >> -        BOARD="cpe510-520" ;;
> >> +        BOARD="cpe510-520-v1" ;;
> >>  esac
> >>
> >>  wget "${UPGRADE_PATH}/release.nfo"
> >> @@ -67,7 +71,7 @@ if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
> >>    done
> >>  fi
> >>
> >> -FILE="fff-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
> >> +FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs-
> >> sysupgrade.bin"
> >>  echo "Downloading $FILE"
> >>  echo ""
> >>  wget "${UPGRADE_PATH}/${FILE}"
> >> --
> >> 2.11.0