From 6ebf7120dfbfe55b560e06d529f2469ae59d1562 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 29 Nov 2016 20:01:54 +0100 Subject: [PATCH] ar71xx: fix syntax error in /lib/ar71xx.sh Fixes: 212c38f0 "ar71xx: add model detection for UBNT Rocket Ti" --- patches/openwrt/0013-fix-UBNT-XM-model-detection.patch | 10 +++++----- ...ing-with-a-space-on-some-TP-LINK-like-devices.patch | 2 +- ...s-in-AR71XX_MODEL-to-match-labels-image-names.patch | 2 +- ...-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch | 2 +- .../0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch | 2 +- ...71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch | 2 +- patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch | 2 +- ...r71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch | 2 +- ...d-revision-detection-for-D-Link-DIR-505-A1-A2.patch | 2 +- ...lit-profile-into-2-profiles-cpe210-and-cpe510.patch | 2 +- .../0068-ar71xx-Added-support-for-TL-WA801NDv3.patch | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch b/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch index cc2b83b2..f99e0f35 100644 --- a/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch +++ b/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch @@ -5,7 +5,7 @@ Subject: fix UBNT XM model detection Signed-off-by: Neal Oakey diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index a9dca58..7da8f54 100755 +index a9dca58..0aa1c86 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -64,6 +64,40 @@ wndr3700_board_detect() { @@ -24,18 +24,18 @@ index a9dca58..7da8f54 100755 + case ${magic:0:3} in + "e00"|\ + "e01"|\ -+ "e80") # It seams that there are different Versions of the Nanostation ++ "e80") + model="Ubiquiti NanoStation M" + ;; + "e0a") + model="Ubiquiti NanoStation loco M" + ;; -+ "e1b"|\ # Note: the M5 / M5 Ti haven't yet been verified! -+ "e1d") # Rocket Ti M ++ "e1b"|\ ++ "e1d") + model="Ubiquiti Rocket M" + ;; + "e20"|\ -+ "e2d") # Bullet Ti M ++ "e2d") + model="Ubiquiti Bullet M" + ;; + "e30") diff --git a/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch b/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch index 6b1774ee..9ea96a61 100644 --- a/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch +++ b/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch @@ -11,7 +11,7 @@ Signed-off-by: Matthias Schiffer Backport of r49106 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 7da8f54..c980633 100755 +index 0aa1c86..96a37b4 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -133,7 +133,7 @@ tplink_board_detect() { diff --git a/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch b/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch index 2ce7dde4..7f4173eb 100644 --- a/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch +++ b/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch @@ -12,7 +12,7 @@ Signed-off-by: Matthias Schiffer Backport of r49107 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index c980633..7e69d81 100755 +index 96a37b4..6c10617 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -162,6 +162,10 @@ tplink_board_detect() { diff --git a/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch b/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch index fe195bc8..79318eca 100644 --- a/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch +++ b/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch @@ -34,7 +34,7 @@ index 032c671..a79376a 100755 mynet-rext |\ wp543) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 7e69d81..478510f 100755 +index 6c10617..ecf584d 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -902,6 +902,9 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch b/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch index 75e415ae..ed85b252 100644 --- a/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch +++ b/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch @@ -49,7 +49,7 @@ index a79376a..2007042 100755 mynet-rext |\ wp543) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 478510f..e4c6057 100755 +index ecf584d..6bc0b86 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -902,8 +902,8 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch b/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch index 2799871c..ad505e3c 100644 --- a/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch +++ b/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch @@ -54,7 +54,7 @@ index 2007042..b59844e 100755 ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index e4c6057..7434a93 100755 +index 6bc0b86..aded7ad 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -905,6 +905,9 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch b/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch index d2a5a1c2..0896c8b2 100644 --- a/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch +++ b/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch @@ -36,7 +36,7 @@ index b59844e..ac3deb8 100755 jwap003 |\ pb42 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 7434a93..f689098 100755 +index aded7ad..f242980 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -503,6 +503,9 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch b/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch index 43269923..a9d03330 100644 --- a/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch +++ b/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch @@ -59,7 +59,7 @@ index ac3deb8..ca9c577 100755 whr-hp-g300n |\ whr-hp-gn |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index f689098..748b9c7 100755 +index f242980..fcd0bc3 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -869,6 +869,9 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch b/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch index c4d07f59..415254f0 100644 --- a/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch +++ b/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch @@ -9,7 +9,7 @@ Signed-off-by: Matthias Schiffer Backport of LEDE 500a67a167a256002f8ab05171f49dfb86b03260 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 748b9c7..28066b1 100755 +index fcd0bc3..20250e9 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -107,6 +107,15 @@ cybertan_get_hw_magic() { diff --git a/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch b/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch index 2ff0c1c6..e19937f9 100644 --- a/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch +++ b/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch @@ -46,7 +46,7 @@ index ca9c577..6c3ecf5 100755 ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 28066b1..45b1f62 100755 +index 20250e9..0d8ccd2 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -447,7 +447,11 @@ ar71xx_board_detect() { diff --git a/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch b/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch index 0d5924f3..2b3aa8de 100644 --- a/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch +++ b/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch @@ -19,7 +19,7 @@ index 6c3ecf5..027a671 100755 ucidef_set_interface_lan "eth1" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index 45b1f62..d0e1d09 100755 +index 0d8ccd2..5928439 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -838,6 +838,9 @@ ar71xx_board_detect() {