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

[Tim Niemeyer]

Hallo

Ich hab lange überlegt:
+ man sieht welche Version es ist
+ man sieht was es ist
- Kompatibilität geht kaputt

Insbesondere bei der Kompatibilität sehe ich zwei Dinge. Das eine ist das /etc/sysupgrade.sh script. Das andere sind die stock Webinterface. Bei den Webinterfaces weiss ich nichts näheres. Das andere kann man fixen.

Von mir also ein
Reviewed-by: Tim Niemeyer <tim.niemeyer at mastersword.de>

Ich wünsche mir aber, dass erst applied wird, wenn auch das sysupgrade.sh angepasst wurde. In der Zwischenzeit könnte der Kommentar unten noch eingearbeitet werden.


Am 28. Januar 2016 00:30:55 MEZ, schrieb Alexander Wunschik <freifunk at wunschik.net>:
>From: mojoaxel <alex at wunschik.net>
>
>---
> bsp/board_ar71xx.bsp  | 41 ++++++++++++++++++++++-------------------
> bsp/board_wdr4300.bsp | 24 +++++++++++++-----------
> bsp/board_wdr4900.bsp | 14 +++++++++++---
> 3 files changed, 46 insertions(+), 33 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..b598bd3 100644
>--- a/bsp/board_wdr4300.bsp
>+++ b/bsp/board_wdr4300.bsp
>@@ -1,5 +1,11 @@
> machine=wdr4300
> target=$builddir/$machine
>+boards=(
>+    tl-wdr3500-v1
Hier ist noch ein Whitespace Problem.

Tim

>+	tl-wdr3600-v1
>+	tl-wdr4300-v1
>+	tl-wdr4310-v1
>+)
> 
> board_prepare() {
> 	echo "nothing todo" > /dev/null
>@@ -10,19 +16,15 @@ board_prebuild() {
> }
> 
> 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
>+}
>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
>+}