From 3839f1dc06518be17ce248eac4ec970dc586b03e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 17 Feb 2015 20:45:41 +0100 Subject: [PATCH 1/7] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 0bc94a05..b5ceb8a9 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a4ed43152165d368ad471d30281fd5c61e5c5e5e PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=bd024a42c98b6fe65fc9bce4ef24d3c4f5e385af +PACKAGES_GLUON_COMMIT=230eebdf1c68919b1f14ecc29501ae4a29a09317 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=5d4ad63897b435d5df0f39a49bd58962c22c33b8 From a376c6cf64683aaf05cc59b5fc18a548ab338146 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 17 Feb 2015 20:48:17 +0100 Subject: [PATCH 2/7] Add support for the UniFi AP Outdoor+ (broken because of WLAN issues) --- ...upport-for-the-UniFi-AP-Outdoor-Plus.patch | 177 ++++++++++++++++++ targets/ar71xx-generic/profiles.mk | 1 + 2 files changed, 178 insertions(+) create mode 100644 patches/openwrt/0016-ar71xx-add-support-for-the-UniFi-AP-Outdoor-Plus.patch diff --git a/patches/openwrt/0016-ar71xx-add-support-for-the-UniFi-AP-Outdoor-Plus.patch b/patches/openwrt/0016-ar71xx-add-support-for-the-UniFi-AP-Outdoor-Plus.patch new file mode 100644 index 00000000..e5c63e4a --- /dev/null +++ b/patches/openwrt/0016-ar71xx-add-support-for-the-UniFi-AP-Outdoor-Plus.patch @@ -0,0 +1,177 @@ +From: blogic +Date: Thu, 22 Jan 2015 09:35:46 +0000 +Subject: ar71xx: add support for the UniFi AP Outdoor Plus + +Signed-off-by: Matthias Schiffer + +diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh +index f0d5d70..6aac86a 100755 +--- a/target/linux/ar71xx/base-files/etc/diag.sh ++++ b/target/linux/ar71xx/base-files/etc/diag.sh +@@ -244,6 +244,9 @@ get_status_led() { + uap-pro) + status_led="ubnt:white:dome" + ;; ++ unifi-outdoor-plus) ++ status_led="ubnt:white:front" ++ ;; + airgateway) + status_led="ubnt:white:status" + ;; +diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh +index c03fe72..9e70397 100755 +--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh ++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh +@@ -723,6 +723,9 @@ ar71xx_board_detect() { + *"UniFiAP Outdoor") + name="unifi-outdoor" + ;; ++ *"UniFiAP Outdoor+") ++ name="unifi-outdoor-plus" ++ ;; + *WP543) + name="wp543" + ;; +diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +index e512f41..49746c4 100755 +--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh ++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +@@ -363,6 +363,7 @@ platform_check_image() { + return 1 + ;; + ++ unifi-outdoor-plus | \ + uap-pro) + [ "$magic_long" != "19852003" ] && { + echo "Invalid image type." +@@ -467,6 +468,7 @@ platform_do_upgrade() { + om5p) + platform_do_upgrade_openmesh "$ARGV" + ;; ++ unifi-outdoor-plus | \ + uap-pro) + MTD_CONFIG_ARGS="-s 0x180000" + default_do_upgrade "$ARGV" +diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile +index ba16c7b..8505ac4 100644 +--- a/target/linux/ar71xx/image/Makefile ++++ b/target/linux/ar71xx/image/Makefile +@@ -1262,6 +1262,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,SMART-300,smart-300,SMART-300,tty + $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,OOLITE,oolite,GS-OOLITE,ttyATH0,115200,0x3C000101,1,16Mlzma)) + + $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x)) ++$(eval $(call SingleProfile,UAPPRO,64k,UBNTUNIFIOUTDOORPLUS,ubnt-unifi-outdoor-plus,UBNT-UOP,ttyS0,115200,BZ,BZ,ar7240)) + + $(eval $(call SingleProfile,UBDEV,64kraw,UBDEV01,ubdev01,UBNT-UF,ttyS0,115200,XM,XM,ar7240)) + +@@ -1324,7 +1325,7 @@ $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4 TLWR941NV5 T + $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2)) + $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4300V1IL TLWDR4310V1 MW4530RV1)) + $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M)) +-$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UAPPRO UBNTAIRGW)) ++$(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UBNTUNIFIOUTDOORPLUS UAPPRO UBNTAIRGW)) + $(eval $(call MultiProfile,WNDR3700,WNDR3700V1 WNDR3700V2 WNDR3800 WNDR3800CH WNDRMAC WNDRMACV2)) + $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R)) + $(eval $(call MultiProfile,WP543,WP543_2M WP543_4M WP543_8M WP543_16M)) +diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch +index 3722519..6bb8884 100644 +--- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch ++++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch +@@ -1,6 +1,6 @@ + --- a/arch/mips/ath79/machtypes.h + +++ b/arch/mips/ath79/machtypes.h +-@@ -16,22 +16,146 @@ ++@@ -16,22 +16,147 @@ + + enum ath79_mach_type { + ATH79_MACH_GENERIC = 0, +@@ -120,6 +120,7 @@ + ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */ + ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */ + ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */ +++ ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */ + ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */ + + ATH79_MACH_WHR_G301N, /* Buffalo WHR-G301N */ + + ATH79_MACH_WHR_HP_G300N, /* Buffalo WHR-HP-G300N */ +diff --git a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch +index 5e3d4d4..3c3c273 100644 +--- a/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch ++++ b/target/linux/ar71xx/patches-3.10/616-MIPS-ath79-ubnt-xw.patch +@@ -1,6 +1,65 @@ + --- a/arch/mips/ath79/mach-ubnt-xm.c + +++ b/arch/mips/ath79/mach-ubnt-xm.c +-@@ -332,3 +332,78 @@ static void __init ubnt_uap_pro_setup(vo ++@@ -186,6 +186,19 @@ static struct gpio_led ubnt_unifi_outdoo ++ } ++ }; ++ +++static struct gpio_led ubnt_unifi_outdoor_plus_leds_gpio[] __initdata = { +++ { +++ .name = "ubnt:white:front", +++ .gpio = 1, +++ .active_low = 0, +++ }, { +++ .name = "ubnt:blue:front", +++ .gpio = 0, +++ .active_low = 0, +++ } +++}; +++ +++ ++ static void __init ubnt_unifi_setup(void) ++ { ++ u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000); ++@@ -245,6 +258,38 @@ MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDO ++ "Ubiquiti UniFiAP Outdoor", ++ ubnt_unifi_outdoor_setup); ++ +++ +++static void __init ubnt_unifi_outdoor_plus_setup(void) +++{ +++ u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000); +++ u8 *mac2 = (u8 *) KSEG1ADDR(0x1fff0000 + ETH_ALEN); +++ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); +++ +++ ath79_register_m25p80(NULL); +++ +++ ath79_register_mdio(0, ~(UBNT_UNIFIOD_PRI_PHYMASK | +++ UBNT_UNIFIOD_2ND_PHYMASK)); +++ +++ ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0); +++ ath79_init_mac(ath79_eth1_data.mac_addr, mac2, 0); +++ ath79_register_eth(0); +++ ath79_register_eth(1); +++ +++ ap91_pci_init(ee, NULL); +++ +++ ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_plus_leds_gpio), +++ ubnt_unifi_outdoor_plus_leds_gpio); +++ +++ ath79_register_gpio_keys_polled(-1, UBNT_XM_KEYS_POLL_INTERVAL, +++ ARRAY_SIZE(ubnt_xm_gpio_keys), +++ ubnt_xm_gpio_keys); +++} +++ +++MIPS_MACHINE(ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, "UBNT-UOP", +++ "Ubiquiti UniFiAP Outdoor+", +++ ubnt_unifi_outdoor_plus_setup); +++ +++ ++ static struct gpio_led ubnt_uap_pro_gpio_leds[] __initdata = { ++ { ++ .name = "ubnt:white:dome", ++@@ -332,3 +377,78 @@ static void __init ubnt_uap_pro_setup(vo + MIPS_MACHINE(ATH79_MACH_UBNT_UAP_PRO, "UAP-PRO", "Ubiquiti UniFi AP Pro", + ubnt_uap_pro_setup); + +@@ -81,8 +140,8 @@ + + ubnt_loco_m_xw_setup); + --- a/arch/mips/ath79/machtypes.h + +++ b/arch/mips/ath79/machtypes.h +-@@ -121,9 +121,11 @@ enum ath79_mach_type { +- ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ ++@@ -123,9 +123,11 @@ enum ath79_mach_type { ++ ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */ + ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ + ATH79_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ + + ATH79_MACH_UBNT_LOCO_M_XW, /* Ubiquiti Loco M XW */ diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 86534f57..4be109db 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -130,6 +130,7 @@ $(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-squashfs,ubiquiti-unifiap-outdo ifeq ($(BROKEN),1) $(eval $(call GluonModel,UBNT,ubnt-ls-sr71-squashfs,ubiquiti-ls-sr71)) # BROKEN: Untested $(eval $(call GluonModel,UBNT,ubnt-uap-pro-squashfs,ubiquiti-unifi-ap-pro)) # BROKEN: not properly tested; probably issues with WLAN adapter detection +$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-plus-squashfs,ubiquiti-unifiap-outdoor+)) # BROKEN: WLAN doesn't work correctly (high packet loss) endif From d158c804ec0d46f16bcf7ac0f4e730bccce04d0f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 18 Feb 2015 01:24:39 +0100 Subject: [PATCH 3/7] Update gluon packages --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b5ceb8a9..de110d52 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=a4ed43152165d368ad471d30281fd5c61e5c5e5e PACKAGES_OPENWRT_BRANCH=for-14.07 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=230eebdf1c68919b1f14ecc29501ae4a29a09317 +PACKAGES_GLUON_COMMIT=fe9eca0422411818486789f9d4c5b26279fcabca PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=5d4ad63897b435d5df0f39a49bd58962c22c33b8 From 754e4af1d738ebb84fd63bd98d6b606613202898 Mon Sep 17 00:00:00 2001 From: Frnk Snck Date: Wed, 18 Feb 2015 17:53:35 +0100 Subject: [PATCH 4/7] Add support for ALLNET ALL0315N Built, flashed and successully tested. This patch takes advantage of patch freifunk-gluon@e93173c which solved issue freifunk-gluon#226 by introducing "GluonProfileFactorySuffix". Packages are separated by a space, not a comma. The ALL0315N initially has a OpenWRT based firmware and there is no need for a factory image. The sysupgrade can be flashed instantly. --- targets/ar71xx-generic/profiles.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 4be109db..56fa2f09 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -169,3 +169,10 @@ $(eval $(call GluonProfileFactorySuffix,WNDR3700,.img)) $(eval $(call GluonModel,WNDR3700,wndr3700-squashfs,netgear-wndr3700)) $(eval $(call GluonModel,WNDR3700,wndr3700v2-squashfs,netgear-wndr3700v2)) $(eval $(call GluonModel,WNDR3700,wndr3800-squashfs,netgear-wndr3800)) + +## Allnet + +# ALL0315N +$(eval $(call GluonProfile,ALL0315N,uboot-envtools rssileds)) +$(eval $(call GluonProfileFactorySuffix,ALL0315N,)) +$(eval $(call GluonModel,ALL0315N,all0315n-squashfs,allnet-all0315n)) From bc648e40295e2f3f43f184eed0e19fa73dd9ec63 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 24 Feb 2015 00:16:22 +0100 Subject: [PATCH 5/7] Add support for NETGEAR WNDRMAC v1/v2 (untested) --- targets/ar71xx-generic/profiles.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 56fa2f09..7d46d4c8 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -163,12 +163,16 @@ $(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300 ## Netgear -# WNDR3700v2/3800 +# WNDR3700 (v1, v2) / WNDR3800 / WNDRMAC (v1, v2) $(eval $(call GluonProfile,WNDR3700)) $(eval $(call GluonProfileFactorySuffix,WNDR3700,.img)) $(eval $(call GluonModel,WNDR3700,wndr3700-squashfs,netgear-wndr3700)) $(eval $(call GluonModel,WNDR3700,wndr3700v2-squashfs,netgear-wndr3700v2)) $(eval $(call GluonModel,WNDR3700,wndr3800-squashfs,netgear-wndr3800)) +ifeq ($(BROKEN),1) +$(eval $(call GluonModel,WNDR3700,wndrmac-squashfs,netgear-wndrmac)) # BROKEN: untested +$(eval $(call GluonModel,WNDR3700,wndrmacv2-squashfs,netgear-wndrmacv2)) # BROKEN: untested +endif ## Allnet From 8f2d0ef15ac9abd570658766317837385233b12d Mon Sep 17 00:00:00 2001 From: dracoTrier Date: Tue, 24 Feb 2015 00:35:19 +0100 Subject: [PATCH 6/7] Add Trier to site.rst --- docs/user/site.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/user/site.rst b/docs/user/site.rst index 28622810..b6b202e9 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -229,3 +229,4 @@ This is a non-exhaustive list of site-repos from various communities: * `site-ffrl `_ (Rheinland) * `site-ffrg `_ (Ruhrgebiet) * `site-ffs `_ (Stuttgart) +* `site-fftr `_ (Trier) From f7ea36e41d279858abdad1242e4e957adb41936b Mon Sep 17 00:00:00 2001 From: pheanex Date: Thu, 26 Feb 2015 12:29:53 +0100 Subject: [PATCH 7/7] Correct small spelling mistake --- docs/user/getting_started.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index bdeab89a..ba5d5be4 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -5,7 +5,7 @@ Selecting the right version --------------------------- Gluon's releases are managed using `Git tags`_. If you're a community getting -started with Gluon we recommend to use the latest stable release if Gluon. +started with Gluon we recommend to use the latest stable release of Gluon. Take a look at the `list of gluon releases`_ and notice the latest release, e.g. *v2014.3*.