| Message ID | 20181125091040.24758-1-fff@chrisi01.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh index dca21a1..87ac48a 100755 --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh @@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name) #decide SOC case $BOARD in tl-wdr4900-v1 ) - SOC="mpc85xx" - SUBTARGET="g" + SOC="mpc85xx-g" ;; * ) - SOC="ar71xx" - SUBTARGET="t" + SOC="ar71xx-t" ;; esac echo "" @@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then done fi -FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs-sysupgrade.bin" +FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin" echo "Downloading $FILE" echo "" wget "${UPGRADE_PATH}/${FILE}"
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> War ich eh schon immer dafür. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Christian Dresel > Sent: Sonntag, 25. November 2018 10:11 > To: franken-dev@freifunk.net > Subject: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET > > This make it easier to use new targets without subtarget. > > Signed-off-by: Christian Dresel <fff@chrisi01.de> > --- > src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++----- > 1 file changed, 3 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 dca21a1..87ac48a 100755 > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > @@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name) > #decide SOC > case $BOARD in > tl-wdr4900-v1 ) > - SOC="mpc85xx" > - SUBTARGET="g" > + SOC="mpc85xx-g" > ;; > * ) > - SOC="ar71xx" > - SUBTARGET="t" > + SOC="ar71xx-t" > ;; > esac > echo "" > @@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then > done > fi > > -FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs- > sysupgrade.bin" > +FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin" > echo "Downloading $FILE" > echo "" > wget "${UPGRADE_PATH}/${FILE}" > -- > 2.11.0
Hallo nochmal, ich würde nach dem Release diesen Patch dann auch schon zeitnah einkippen, dann müssen wir den für die Fritzbox-Diskussion nicht mitschleifen. Grüße Adrian From: Adrian Schmutzler [mailto:mail@adrianschmutzler.de] Sent: Mittwoch, 28. November 2018 14:33 To: 'Christian Dresel' <fff@chrisi01.de>; franken-dev@freifunk.net Subject: RE: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > War ich eh schon immer dafür. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Christian Dresel > Sent: Sonntag, 25. November 2018 10:11 > To: franken-dev@freifunk.net <mailto:franken-dev@freifunk.net> > Subject: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET > > This make it easier to use new targets without subtarget. > > Signed-off-by: Christian Dresel <fff@chrisi01.de <mailto:fff@chrisi01.de> > > --- > src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++----- > 1 file changed, 3 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 dca21a1..87ac48a 100755 > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > @@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name) > #decide SOC > case $BOARD in > tl-wdr4900-v1 ) > - SOC="mpc85xx" > - SUBTARGET="g" > + SOC="mpc85xx-g" > ;; > * ) > - SOC="ar71xx" > - SUBTARGET="t" > + SOC="ar71xx-t" > ;; > esac > echo "" > @@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then > done > fi > > -FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs- > sysupgrade.bin" > +FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin" > echo "Downloading $FILE" > echo "" > wget "${UPGRADE_PATH}/${FILE}" > -- > 2.11.0
Applied. From: mail@adrianschmutzler.de [mailto:mail@adrianschmutzler.de] Sent: Sonntag, 2. Dezember 2018 14:00 To: 'franken-dev@freifunk.net' <franken-dev@freifunk.net> Subject: RE: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET Hallo nochmal, ich würde nach dem Release diesen Patch dann auch schon zeitnah einkippen, dann müssen wir den für die Fritzbox-Diskussion nicht mitschleifen. Grüße Adrian From: Adrian Schmutzler [mailto:mail@adrianschmutzler.de] Sent: Mittwoch, 28. November 2018 14:33 To: 'Christian Dresel' <fff@chrisi01.de <mailto:fff@chrisi01.de> >; franken-dev@freifunk.net <mailto:franken-dev@freifunk.net> Subject: RE: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > War ich eh schon immer dafür. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Christian Dresel > Sent: Sonntag, 25. November 2018 10:11 > To: franken-dev@freifunk.net <mailto:franken-dev@freifunk.net> > Subject: [PATCH] fff-sysupgrade: merge SOC and SUBTARGET > > This make it easier to use new targets without subtarget. > > Signed-off-by: Christian Dresel <fff@chrisi01.de <mailto:fff@chrisi01.de> > > --- > src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++----- > 1 file changed, 3 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 dca21a1..87ac48a 100755 > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > @@ -17,12 +17,10 @@ BOARD=$(uci get board.model.name) > #decide SOC > case $BOARD in > tl-wdr4900-v1 ) > - SOC="mpc85xx" > - SUBTARGET="g" > + SOC="mpc85xx-g" > ;; > * ) > - SOC="ar71xx" > - SUBTARGET="t" > + SOC="ar71xx-t" > ;; > esac > echo "" > @@ -71,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then > done > fi > > -FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs- > sysupgrade.bin" > +FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin" > echo "Downloading $FILE" > echo "" > wget "${UPGRADE_PATH}/${FILE}" > -- > 2.11.0
This make it easier to use new targets without subtarget. Signed-off-by: Christian Dresel <fff@chrisi01.de> --- src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)