[PATCH v2 10/15] buildscript/bsps: use new images names froms lede
Tim Niemeyer
tim at tn-x.org
So Feb 5 19:13:42 CET 2017
Signed-off-by: Tim Niemeyer <tim at tn-x.org>
---
Changes in v2:
- fix copying of factory images
bsp/board_ar71xx.bsp | 50 +++++++++++++++++++++++++-------------------------
bsp/board_archerc7.bsp | 2 +-
bsp/board_wdr4900.bsp | 2 +-
buildscript | 8 ++++----
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp
index 2cd7cf5..58f6fb2 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/board_ar71xx.bsp
@@ -1,29 +1,29 @@
machine=ar71xx
chipset=ar71xx
target=$builddir/$machine
-images=("openwrt-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr740n-v4-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr741nd-v2-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr741nd-v4-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr841n-v10-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr841n-v11-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
- "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
+images=("lede-ar71xx-generic-cpe210-220-510-520-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr740n-v4-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr741nd-v2-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr741nd-v4-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr841nd-v7-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr841n-v8-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr841n-v9-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr841n-v10-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr841n-v11-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin"
+ "lede-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin"
)
diff --git a/bsp/board_archerc7.bsp b/bsp/board_archerc7.bsp
index 73b4d81..5427e0b 100644
--- a/bsp/board_archerc7.bsp
+++ b/bsp/board_archerc7.bsp
@@ -1,5 +1,5 @@
machine=archerc7
chipset=ar71xx
target=$builddir/$machine
-images=("openwrt-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin"
+images=("lede-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin"
)
diff --git a/bsp/board_wdr4900.bsp b/bsp/board_wdr4900.bsp
index f95ded7..cc7157d 100644
--- a/bsp/board_wdr4900.bsp
+++ b/bsp/board_wdr4900.bsp
@@ -3,5 +3,5 @@ chipset=mpc85xx
target=$builddir/$machine
images=(
- "openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin"
+ "lede-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin"
)
diff --git a/buildscript b/buildscript
index eb3bc10..c1cdb7b 100755
--- a/buildscript
+++ b/buildscript
@@ -277,18 +277,18 @@ cp_firmware() {
fi
for image in ${images[@]}; do
- filename_build=${image//openwrt/${community}-${version}}
+ filename_build=${image//lede/${community}-${version}}
filename_build=${filename_build//generic/g}
- cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
+ cp "$target/bin/targets/${chipset}/generic/$image" "./bin/$filename_build"
for region in "" "-eu" "-us"; do
image_factory=${image/sysupgrade/factory$region}
- if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
+ if [[ -f "$target/bin/targets/${chipset}/generic/$image_factory" ]]; then
filename_build_factory=${filename_build/sysupgrade/factory$region}
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"
+ cp "$target/bin/targets/${chipset}/generic/$image_factory" "./bin/$filename_build_factory"
fi
done
done
--
2.1.4
Mehr Informationen über die Mailingliste franken-dev