From 0fb23d67f00a18c3f9e712ca97cfc34b38071f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 5 Nov 2019 23:57:37 +0100 Subject: [PATCH 1/3] build: image: fix build breakage of some images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 881ed09ee6e2 ("build: create JSON files containing image info") has removed the crucial empty new line from the image copy step resulting in the following errors during make function expansion: GZ_SUFFIX := bash: GZ_SUFFIX: command not found Makefile:86: recipe for target 'openwrt-ath79-generic-tplink_archer-c7-v5-squashfs-sysupgrade.bin' failed Fixes: 881ed09ee6e2 ("build: create JSON files containing image info") Signed-off-by: Petr Štetiar --- include/image.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/image.mk b/include/image.mk index 940ae812ea..77d4567197 100644 --- a/include/image.mk +++ b/include/image.mk @@ -597,6 +597,7 @@ define Device/Build/image SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \ $(TOPDIR)/scripts/json_add_image_info.py \ ) + endef define Device/Build/artifact From d47b68700644f37084b82845e9557b1e9954f533 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Wed, 6 Nov 2019 10:44:10 +0100 Subject: [PATCH 2/3] ath79: update uboot-envtools for Netgear WNR routers Boards added: WNR1000v2, WNR2000v3, WNR612v2, WNDR3700. Signed-off-by: Michal Cieslakiewicz --- package/boot/uboot-envtools/files/ath79 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79 index 5da5df2420..fefbb48801 100644 --- a/package/boot/uboot-envtools/files/ath79 +++ b/package/boot/uboot-envtools/files/ath79 @@ -22,8 +22,11 @@ glinet,gl-ar300m-nor|\ librerouter,librerouter-v1|\ netgear,ex6400|\ netgear,ex7300|\ +netgear,wnr1000-v2|\ +netgear,wnr2000-v3|\ netgear,wnr2200-8m|\ netgear,wnr2200-16m|\ +netgear,wnr612-v2|\ ocedo,koala|\ ocedo,raccoon|\ openmesh,om5p-ac-v2|\ @@ -33,6 +36,9 @@ yuncore,a770) buffalo,wzr-hp-ag300h) ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000" ;; +netgear,wndr3700) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x10000" + ;; netgear,wndr4300) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" ;; From 11052900494ec8216b9b39ba0b24d5e036f4d323 Mon Sep 17 00:00:00 2001 From: Michal Cieslakiewicz Date: Wed, 6 Nov 2019 10:43:14 +0100 Subject: [PATCH 3/3] ar71xx: update uboot-envtools for Netgear WNR routers Boards added: WNR1000v2, WNR2000v3, WNR2200, WNR612v2, WNDR4300. Boards changed: WNDR3700 (u-boot env size is 2 sectors not 1). Signed-off-by: Michal Cieslakiewicz --- package/boot/uboot-envtools/files/ar71xx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx index b4e8d995c8..bc415e3b8c 100644 --- a/package/boot/uboot-envtools/files/ar71xx +++ b/package/boot/uboot-envtools/files/ar71xx @@ -58,7 +58,10 @@ sr3200|\ t830|\ tube2h|\ wam250|\ -wndr3700|\ +wnr1000-v2|\ +wnr2000-v3|\ +wnr2200|\ +wnr612-v2|\ xd3200) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" ;; @@ -92,6 +95,12 @@ qihoo-c301) wi2a-ac200i) ubootenv_add_uci_config "/dev/mtd4" "0x0" "0x8000" "0x10000" ;; +wndr3700) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x10000" + ;; +wndr4300) + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000" + ;; esac config_load ubootenv