[PATCH v2 1/4] use custom names for binary builds. fixes #9

Sa Jan 30 10:01:51 CET 2016

Hi

Danke fürs Nachbessern.

Wie gesagt, wünsche mir aber, dass der Patch erst applied wird, wenn
auch das sysupgrade.sh angepasst wurde.

Am Freitag, den 29.01.2016, 00:19 +0100 schrieb Alexander Wunschik:
> From: mojoaxel <alex at wunschik.net>
> 
> Signed-off-by: Alexander Wunschik <freifunk at wunschik.net>
Da du nur die Whitespaces gefixt hast, hättest du mein
Reviewed-by: Tim Niemeyer <tim.niemeyer at mastersword.de>
gern übernehmen können.

> ---
Tipp: An diese Position, zwischen Scissors und Patch kann man hinein
schreiben, was sich an dem Patch im Vergleich zur letzten Version
geändert hat.

Ein Patch hat mehr Erfolg auf Review, wenn man davon Nutzen macht.

Tim

>  bsp/board_ar71xx.bsp  | 41 ++++++++++++++++++++++-------------------
>  bsp/board_wdr4300.bsp | 30 ++++++++++++++++--------------
>  bsp/board_wdr4900.bsp | 14 +++++++++++---
>  3 files changed, 49 insertions(+), 36 deletions(-)
> 
> diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
> index 35bcd6b..36e56f6 100644
> --- a/bsp/board_ar71xx.bsp
> +++ b/bsp/board_ar71xx.bsp
> @@ -1,5 +1,21 @@
>  machine=ar71xx
>  target=$builddir/$machine
> +boards=(
> +    ubnt-nano-m
> +    tl-wr740n-v4
> +    tl-wr741nd-v2
> +    tl-wr741nd-v4
> +    tl-wr841nd-v7
> +    tl-wr841n-v8
> +    tl-wr841n-v9
> +    tl-wr841n-v10
> +    tl-wr842n-v2
> +    tl-wr1043nd-v1
> +    tl-wr1043nd-v2
> +    tl-wr1043nd-v3
> +    tl-wa850re-v1
> +    tl-wa860re-v1
> +)
>  
>  board_prepare() {
>      echo "nothing todo" > /dev/null
> @@ -10,26 +26,13 @@ board_prebuild() {
>  }
>  
>  board_postbuild() {
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-ubnt-nano-m-squashfs-*.bin ./bin/
> +    for board in ${boards[@]}; do
> +        filename_openwrt=openwrt-ar71xx-generic-${board}-squashfs
> +        filename_build=fff-${community}_${version}_${board}
>  
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr740n-v4-squashfs-*.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr741nd-v2-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr741nd-v4-squashfs-*.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841nd-v7-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841n-v8-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841n-v9-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841n-v10-squashfs-*.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr842n-v2-squashfs-*.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr1043nd-v1-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr1043nd-v3-squashfs-*.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wa860re-v1-squashfs-*.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wa850re-v1-squashfs-*.bin ./bin/
> +        cp $target/bin/ar71xx/${filename_openwrt}-factory.bin ./bin/${filename_build}_factory.bin
> +        cp $target/bin/ar71xx/${filename_openwrt}-sysupgrade.bin ./bin/${filename_build}_sysupgrade.bin
> +    done
>  }
>  
>  board_clean() {
> diff --git a/bsp/board_wdr4300.bsp b/bsp/board_wdr4300.bsp
> index 7e6c66e..1ee666d 100644
> --- a/bsp/board_wdr4300.bsp
> +++ b/bsp/board_wdr4300.bsp
> @@ -1,28 +1,30 @@
>  machine=wdr4300
>  target=$builddir/$machine
> +boards=(
> +    tl-wdr3500-v1
> +    tl-wdr3600-v1
> +    tl-wdr4300-v1
> +    tl-wdr4310-v1
> +)
>  
>  board_prepare() {
> -	echo "nothing todo" > /dev/null
> +    echo "nothing todo" > /dev/null
>  }
>  
>  board_prebuild() {
> -	echo "nothing todo" > /dev/null
> +    echo "nothing todo" > /dev/null
>  }
>  
>  board_postbuild() {
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-factory.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin ./bin/
> +    for board in ${boards[@]}; do
> +        filename_openwrt=openwrt-ar71xx-generic-${board}-squashfs
> +        filename_build=fff-${community}_${version}_${board}
>  
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-factory.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-factory.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin ./bin/
> -
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-factory.bin ./bin/
> -    cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin ./bin/
> +        cp $target/bin/ar71xx/${filename_openwrt}-factory.bin ./bin/${filename_build}_factory.bin
> +        cp $target/bin/ar71xx/${filename_openwrt}-sysupgrade.bin ./bin/${filename_build}_sysupgrade.bin
> +    done
>  }
>  
>  board_clean() {
> -	/bin/rm -rf $target bin/*$machine*
> -}
> \ No newline at end of file
> +    /bin/rm -rf $target bin/*$machine*
> +}
> diff --git a/bsp/board_wdr4900.bsp b/bsp/board_wdr4900.bsp
> index 777b3b5..9d76772 100644
> --- a/bsp/board_wdr4900.bsp
> +++ b/bsp/board_wdr4900.bsp
> @@ -1,5 +1,8 @@
>  machine=wdr4900
>  target=$builddir/$machine
> +boards=(
> +    tl-wdr4900-v1
> +)
>  
>  board_prepare() {
>  	echo "nothing todo" > /dev/null
> @@ -10,10 +13,15 @@ board_prebuild() {
>  }
>  
>  board_postbuild() {
> -    cp $target/bin/mpc85xx/openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-factory.bin ./bin/
> -    cp $target/bin/mpc85xx/openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin ./bin/
> +    for board in ${boards[@]}; do
> +        filename_openwrt=openwrt-mpc85xx-generic-${board}-squashfs
> +        filename_build=fff-${community}_${version}_${board}
> +
> +        cp $target/bin/mpc85xx/${filename_openwrt}-factory.bin ./bin/${filename_build}_factory.bin
> +        cp $target/bin/mpc85xx/${filename_openwrt}-sysupgrade.bin ./bin/${filename_build}_sysupgrade.bin
> +    done
>  }
>  
>  board_clean() {
>  	/bin/rm -rf $target bin/*$machine*
> -}
> \ No newline at end of file
> +}
> -- 
> 1.8.3.2
> 

-------------- 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/20160130/1d2e1355/attachment-0002.sig>