Merge branch 'testing' into stable

extra/template.conf

@@ -135,6 +135,7 @@
 						key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
 						remotes = {
 							'"gw06.ffho.net" port 100%ID',
+							'ipv6 "2001:41d0:a:377a::54" port 100%ID',
 							'ipv4 "5.196.106.54" port 100%ID',
 						},
 					},
@@ -176,7 +177,6 @@
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-					'5126eda4161bca3fcae134fa0e1824e55dffb986cc4e7fe37842857a118e2820', -- leeps
 				},
 			},
 			testing = {
@@ -189,7 +189,6 @@
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-					'5126eda4161bca3fcae134fa0e1824e55dffb986cc4e7fe37842857a118e2820', -- leeps
 				},
 			},
 			experimental = {
@@ -202,7 +201,6 @@
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
 					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-					'5126eda4161bca3fcae134fa0e1824e55dffb986cc4e7fe37842857a118e2820', -- leeps
 				},
 			},
 		},
@@ -237,8 +235,8 @@
 	},
 
 	ath9k_workaround = {
-		blackout_wait = 90,
-		reset_wait = 720,
+		blackout_wait = 60,
+		reset_wait = 300,
 		step_size = 10,
 	},
 }

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=a723748cac47b8484cd9a24b957b36a160dcd77c
+PACKAGES_FFHO_COMMIT=33f44ef1cae86899f30614f69e10b692c82e4545

site.mk

@@ -34,6 +34,9 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
+APU2_NIC := \
+	kmod-igb
+
 USB_BASIC := \
 	kmod-usb-core \
 	kmod-usb2 \
@@ -46,22 +49,29 @@ USB_NIC := \
 	kmod-usb-net-rtl8152 \
 	kmod-usb-net-dm9601-ether
 
+WLAN := \
+	kmod-ath9k \
+	kmod-ath10k-ct \
+	ath10k-firmware-qca988x-11s
+
 ifeq ($(GLUON_TARGET),x86-generic)
 	GLUON_SITE_PACKAGES += \
 		$(USB_BASIC) \
 		kmod-usb-ohci-pci \
-		$(USB_NIC)
+		$(USB_NIC) \
+		$(WLAN)
 endif
 
 ifeq ($(GLUON_TARGET),x86-64)
 	GLUON_SITE_PACKAGES += \
+		$(APU2_NIC) \
 		$(USB_BASIC) \
 		$(USB_NIC) \
-		kmod-igb #APU2
+		$(WLAN)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.0.3~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.0.4~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)