Merge remote-tracking branch 'upstream/master'

Makefile

@@ -199,6 +199,7 @@ feeds: FORCE
 	+$(GLUONMAKE_EARLY) prepare-tmpinfo
 
 config: FORCE
+	+$(GLUONMAKE) prepare-tmpinfo
 	( \
 		cat $(GLUONDIR)/include/config $(GLUONDIR)/targets/$(GLUON_TARGET)/config; \
 		echo '$(patsubst %,CONFIG_PACKAGE_%=m,$(sort $(filter-out -%,$(GLUON_DEFAULT_PACKAGES) $(GLUON_SITE_PACKAGES) $(PROFILE_PACKAGES))))' \
@@ -207,13 +208,16 @@ config: FORCE
 	+$(NO_TRACE_MAKE) defconfig OPENWRT_BUILD=0
 
 prepare-target: FORCE
-	mkdir -p $(GLUON_OPENWRTDIR)
+	rm $(GLUON_OPENWRTDIR)/tmp || true
-	for dir in build_dir dl staging_dir tmp; do \
+	mkdir -p $(GLUON_OPENWRTDIR)/tmp
+
+	for dir in build_dir dl staging_dir; do \
 		mkdir -p $(GLUON_ORIGOPENWRTDIR)/$$dir; \
 	done
-	for link in build_dir config Config.in dl include Makefile package rules.mk scripts staging_dir target tmp toolchain tools; do \
+	for link in build_dir config Config.in dl include Makefile package rules.mk scripts staging_dir target toolchain tools; do \
 		ln -sf $(GLUON_ORIGOPENWRTDIR)/$$link $(GLUON_OPENWRTDIR); \
 	done
+
 	+$(GLUONMAKE_EARLY) feeds
 	+$(GLUONMAKE_EARLY) gluon-tools
 	+$(GLUONMAKE) config
@@ -237,7 +241,9 @@ clean: FORCE
 	rm -f $(gluon_prepared_stamp)
 
 dirclean: FORCE
-	+$(SUBMAKE) dirclean
+	for dir in build_dir dl staging_dir tmp; do \
+		rm -rf $(GLUON_ORIGOPENWRTDIR)/$$dir; \
+	done
 	rm -rf $(GLUON_BUILDDIR)
 
 

README.md

@@ -6,6 +6,12 @@ If you're new to Gluon and ready to get your feet wet, have a look at the
 
 **Gluon IRC channel: `#gluon` in [hackint](http://hackint.org/)**
 
+## Issues & Feature requests
+
+Before opening an issue make sure to read check whether any existing issues
+(open or closed) match. If you're suggesting a new feature, drop by on IRC or
+our mailinglist to discuss it first.
+
 ## Use a release!
 
 Please refrain from using the master branch for anything else but development purposes!
@@ -15,15 +21,7 @@ and switch to one by running `git checkout v2014.3;make update`.
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.
 
-## Mailinglist (mostly for announcements)
+## Mailinglist
-
-I can handle administrative requests automatically. Please
-do not send them to the list address! Instead, send
-your message to the correct command address:
-
-For help and a description of available commands, send a message to:
-
-    gluon-help@luebeck.freifunk.net
 
 To subscribe to the list, send a message to:
 
@@ -35,15 +33,3 @@ message. If you haven't changed addresses since subscribing,
 you can also send a message to:
 
     gluon-unsubscribe@luebeck.freifunk.net
-
-or for the digest to:
-
-    gluon-digest-unsubscribe@luebeck.freifunk.net
-
-If you need to get in touch with the human owner of this list,
-please send a message to:
-
-     gluon-owner@luebeck.freifunk.net
-
-Please include a FORWARDED list message with ALL HEADERS intact
-to make it easier to help you.

docs/features/roles.rst

@@ -0,0 +1,32 @@
+Roles
+=====
+
+It is possible to define a set of roles you want to distinguish at backend side. One node can own one
+role which it will announce via alfred inside the mesh. This will make it easier to differentiate 
+nodes when parsing alfred data. E.g to count only **normal** nodes and not the gateways
+or servers (nodemap). A lot of things are possible.
+
+For this the section ``roles`` in ``site.conf`` is needed::
+
+  roles = {
+    default = 'node',
+    list = {
+      node = 'Normal Node',
+      test = 'Test Node',
+      backbone = 'Backbone Node',
+      service = 'Service Node',
+    },
+  },
+
+The value of ``default`` is the role every node will initially own. This value should be part of ``list`` as well.
+If you want node owners to change the defined roles via config-mode you can add the package
+``gluon-luci-node-role`` to your ``site.mk``. Then, you can select one of the defined roles from a dropdown list
+where the right-handed value is the one which is displayed and the left-handed key the one which is configured into 
+the system.
+
+The role is saved in ``gluon-node-info.system.role``. To change the role using command line do::
+
+  uci set gluon-node-info.system.role="$ROLE"
+  uci commit
+
+Please replace ``$ROLE`` by the role you want the node to own.

docs/index.rst

@@ -27,6 +27,7 @@ Features
    features/mesh-on-wan
    features/announce
    features/authorized-keys
+   features/roles
 
 Developer Documentation
 -----------------------

docs/site-example/site.conf

@@ -135,6 +135,17 @@
     },
   },
 
+  -- Node roles
+  -- roles {
+  --   default = 'node',
+  --   list = {
+  --     node = 'Normal Node',
+  --     test = 'Test Node',
+  --     backbone = 'Backbone Node',
+  --     service = 'Service Node',
+  --   },
+  -- },
+
   -- Bandwidth limiting
   simple_tc = {
     mesh_vpn = {

docs/user/site.rst

@@ -120,7 +120,6 @@ autoupdater : package
     ::
 
       autoupdater = {
-        enabled = 1,
         branch = 'experimental',
         branches = {
           stable = {
@@ -139,6 +138,26 @@ autoupdater : package
         }
       }
 
+roles : optional
+    Optional role definitions. With this nodes will announce their role inside the mesh.
+    In the backend this adds the facility to distinguish between normal, backbone and
+    service nodes or even gateways (if they advertise the role, also). It is up to
+    the community which roles to define. See the section below as an example.
+    ``default`` takes the default role which is set initially. This value should be
+    part of ``list``. If you want node owners to change the role via config mode add
+    the package ``gluon-luci-node-role`` to ``site.mk``.
+    ::
+
+      roles = {
+        default = 'node',
+        list = {
+          node = 'Normal Node',
+          test = 'Test Node',
+          backbone = 'Backbone Node',
+          service = 'Service Node',
+        },
+      },
+
 simple_tc : package
     Uplink traffic control
     ::

include/config

@@ -15,5 +15,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT=y
 
 CONFIG_ATH_USER_REGD=y
 CONFIG_PACKAGE_ATH_DEBUG=y
+CONFIG_ATH10K_CT_COMMUNITY_FW=y
 
 CONFIG_PACKAGE_luci-base_srcdiet=y

modules

@@ -1,14 +1,14 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git
-OPENWRT_COMMIT=5a87b123592190faf6645c01ece1d75eeb6f9ceb
+OPENWRT_COMMIT=878af3117f68c2f8d6b3d6582e50c6cef521f6f7
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=a4ed43152165d368ad471d30281fd5c61e5c5e5e
+PACKAGES_OPENWRT_COMMIT=01fcd1f29174a56d6ddb59901ed8c67ea42c3a8f
 PACKAGES_OPENWRT_BRANCH=for-14.07
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=fe9eca0422411818486789f9d4c5b26279fcabca
+PACKAGES_GLUON_COMMIT=8ee69212a3b27a9fc5ef6d25016d82ea80ec1a7d
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_COMMIT=5d4ad63897b435d5df0f39a49bd58962c22c33b8

patches/openwrt/0018-ath10k-update-firmware-to-the-latest-version.patch

@@ -0,0 +1,41 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 10 Mar 2015 13:17:06 +0100
+Subject: ath10k: update firmware to the latest version
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
+index b96e782..629692d 100644
+--- a/package/kernel/mac80211/Makefile
++++ b/package/kernel/mac80211/Makefile
+@@ -129,7 +129,7 @@ endef
+ $(eval $(call Download,linux-firmware))
+ 
+ PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
+-PKG_ATH10K_LINUX_FIRMWARE_VERSION:=38eeda3ae6f90fde5546bdd48ee4ff3090f238c0
++PKG_ATH10K_LINUX_FIRMWARE_VERSION:=232b419e71dab27b52b96e80ea7649ed67bdac77
+ PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2
+ PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git
+ PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
+@@ -1821,18 +1821,17 @@ endef
+ 
+ define KernelPackage/ath10k/install
+ 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
+-ifeq ($(CONFIG_ATH10K_STA_FW),y)
+ 	$(INSTALL_DATA) \
+ 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
++ifeq ($(CONFIG_ATH10K_STA_FW),y)
+ 	$(INSTALL_DATA) \
+ 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/main/firmware-2.bin_999.999.0.636 \
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
+ else
+ 	$(INSTALL_DATA) \
+-		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
+-		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/firmware-2.bin \
+-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
++		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2/firmware-3.bin_10.2-00082-4-2 \
++		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-3.bin
+ endif
+ endef
+ 

patches/openwrt/0019-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch

@@ -0,0 +1,81 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 10 Mar 2015 13:17:14 +0100
+Subject: ath10k: add Candelatech community firmware as an additional choice
+
+diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
+index 629692d..d77842a 100644
+--- a/package/kernel/mac80211/Makefile
++++ b/package/kernel/mac80211/Makefile
+@@ -605,6 +605,14 @@ This module adds support for wireless adapters based on
+ Atheros USB AR9271 and AR7010 family of chipsets.
+ endef
+ 
++ATH10K_CT_COMMUNITY_FW:=firmware-2-ct-full-community-13.bin
++define Download/ath10k-firmware-ct-community
++  FILE:=$(ATH10K_CT_COMMUNITY_FW)
++  URL:=http://www.candelatech.com/downloads/
++  MD5SUM:=a3decc529b0171ae9ec4495089ab354a
++endef
++$(eval $(call Download,ath10k-firmware-ct-community))
++
+ define KernelPackage/ath10k
+   $(call KernelPackage/mac80211/Default)
+   TITLE:=Atheros 802.11ac wireless cards support
+@@ -625,13 +633,31 @@ endef
+ define KernelPackage/ath10k/config
+   if PACKAGE_kmod-ath10k
+ 
++	choice
++		prompt "ath10k firmware flavour"
++		default ATH10K_AP_FW
++		help
++		  This option allows you to choose between different ath10k firmwares.
++
++	config ATH10K_AP_FW
++		bool "Firmware optimized for AP operation"
++		help
++		  Use the ath10k firmware optimized for access point operation.
++		  Supports only AP mode, will crash in IBSS (ad-hoc) mode.
++
+ 	config ATH10K_STA_FW
+ 		bool "Firmware optimized for STA operation"
+-		default n
+ 		help
+ 		  Use the ath10k firmware optimized for wireless client instead
+-		  of access point operation.
++		  of access point operation. Might be unstable in AP mode.
++
++	config ATH10K_CT_COMMUNITY_FW
++		bool "Firmware by Candela Technologies (community version)"
++		help
++		  Supports both AP and IBSS (ad-hoc) mode. Doesn't support
++		  encryption when using multiple VIFs.
+ 
++	endchoice
+   endif
+ endef
+ 
+@@ -1824,14 +1850,20 @@ define KernelPackage/ath10k/install
+ 	$(INSTALL_DATA) \
+ 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
++ifeq ($(CONFIG_ATH10K_AP_FW),y)
++	$(INSTALL_DATA) \
++		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2/firmware-3.bin_10.2-00082-4-2 \
++		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-3.bin
++endif
+ ifeq ($(CONFIG_ATH10K_STA_FW),y)
+ 	$(INSTALL_DATA) \
+ 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/main/firmware-2.bin_999.999.0.636 \
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
+-else
++endif
++ifeq ($(CONFIG_ATH10K_CT_COMMUNITY_FW),y)
+ 	$(INSTALL_DATA) \
+-		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2/firmware-3.bin_10.2-00082-4-2 \
+-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-3.bin
++		$(DL_DIR)/$(ATH10K_CT_COMMUNITY_FW) \
++		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
+ endif
+ endef
+ 

patches/openwrt/0020-at71xx-TP-LINK-Archer-add-5GHz-led-entry.patch

@@ -0,0 +1,20 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 10 Mar 2015 13:17:23 +0100
+Subject: at71xx: TP-LINK Archer: add 5GHz led entry
+
+Add 5GHz led entry after r44033.
+
+Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
+
+diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+index a74b8f4..36fe028 100755
+--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
++++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+@@ -326,6 +326,7 @@ tl-wdr4900-v2)
+ 	ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1"
+ 	ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "2-1"
+ 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt"
++	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy1tpt"
+ 	;;
+ 
+ tl-wr741nd)

patches/openwrt/0021-ar71xx-fix-switched-WLAN-LEDs-on-TP-LINK-Archer-C5-C7.patch

@@ -0,0 +1,34 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 10 Mar 2015 14:06:01 +0100
+Subject: ar71xx: fix switched WLAN LEDs on TP-LINK Archer C5/C7
+
+ath10k is loaded before ath9k, so the 5GHz adapter becomes phy0.
+
+diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+index 36fe028..315a9fd 100755
+--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
++++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+@@ -320,8 +320,6 @@ tl-wdr4300)
+ 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt"
+ 	;;
+ 
+-archer-c5|\
+-archer-c7|\
+ tl-wdr4900-v2)
+ 	ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1"
+ 	ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "2-1"
+@@ -329,6 +327,14 @@ tl-wdr4900-v2)
+ 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy1tpt"
+ 	;;
+ 
++archer-c5|\
++archer-c7)
++	ucidef_set_led_usbdev "usb1" "USB1" "tp-link:green:usb1" "1-1"
++	ucidef_set_led_usbdev "usb2" "USB2" "tp-link:green:usb2" "2-1"
++	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy1tpt"
++	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy0tpt"
++	;;
++
+ tl-wr741nd)
+ 	ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+ 	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x02"

targets/ar71xx-generic/profiles.mk

@@ -9,6 +9,13 @@ $(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe220-v1.0)
 $(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe510-v1.0))
 $(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe520-v1.0))
 
+# TL-WA701N/ND v1, v2
+$(eval $(call GluonProfile,TLWA701))
+$(eval $(call GluonModel,TLWA701,tl-wa701n-v1-squashfs,tp-link-tl-wa701n-nd-v1))
+ifeq ($(BROKEN),1)
+$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2-squashfs,tp-link-tl-wa701n-nd-v2)) # BROKEN: untested
+endif
+
 # TL-WR703N v1
 $(eval $(call GluonProfile,TLWR703))
 $(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1))
@@ -29,6 +36,11 @@ $(eval $(call GluonModel,TLWR741,tl-wr741nd-v1-squashfs,tp-link-tl-wr741n-nd-v1)
 $(eval $(call GluonModel,TLWR741,tl-wr741nd-v2-squashfs,tp-link-tl-wr741n-nd-v2))
 $(eval $(call GluonModel,TLWR741,tl-wr741nd-v4-squashfs,tp-link-tl-wr741n-nd-v4))
 
+# TL-WR743N/ND v1, v1.1, v2
+$(eval $(call GluonProfile,TLWR743))
+$(eval $(call GluonModel,TLWR743,tl-wr743nd-v1-squashfs,tp-link-tl-wr743n-nd-v1))
+$(eval $(call GluonModel,TLWR743,tl-wr743nd-v2-squashfs,tp-link-tl-wr743n-nd-v2))
+
 # TL-WR801N/ND v2
 $(eval $(call GluonProfile,TLWA801))
 $(eval $(call GluonModel,TLWA801,tl-wa801nd-v2-squashfs,tp-link-tl-wa801n-nd-v2))

targets/targets.mk

@@ -1,6 +1,7 @@
 $(eval $(call GluonTarget,ar71xx,generic))
 $(eval $(call GluonTarget,mpc85xx,generic))
 $(eval $(call GluonTarget,x86,generic))
+$(eval $(call GluonTarget,x86,kvm_guest))
 
 ifneq ($(BROKEN),)
 $(eval $(call GluonTarget,ramips,rt305x))

targets/x86-generic/profiles.mk

@@ -1,10 +1,10 @@
-$(eval $(call GluonProfile,GENERIC))
+$(eval $(call GluonProfile,GENERIC,kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity))
 $(eval $(call GluonProfileFactorySuffix,GENERIC))
 $(eval $(call GluonProfileSysupgradeSuffix,GENERIC))
 $(eval $(call GluonProfileExtraSuffix,GENERIC,.img.gz))
 $(eval $(call GluonModel,GENERIC,combined-ext4,x86-generic))
 
-$(eval $(call GluonProfile,VDI,kmod-pcnet32))
+$(eval $(call GluonProfile,VDI,kmod-pcnet32 kmod-e1000))
 $(eval $(call GluonProfileFactorySuffix,VDI))
 $(eval $(call GluonProfileSysupgradeSuffix,VDI))
 $(eval $(call GluonProfileExtraSuffix,VDI,.vdi))

targets/x86-kvm_guest/config

@@ -0,0 +1,3 @@
+CONFIG_TARGET_x86=y
+CONFIG_TARGET_x86_kvm_guest=y
+CONFIG_TARGET_ROOTFS_PARTNAME="/dev/vda2"

targets/x86-kvm_guest/kernel-vermagic

@@ -0,0 +1 @@
+5e81ad3c25d4a4f02e749f398f1868c5

targets/x86-kvm_guest/profiles.mk

@@ -0,0 +1,5 @@
+$(eval $(call GluonProfile,KVM,kmod-virtio-balloon kmod-virtio-net kmod-virtio-random))
+$(eval $(call GluonProfileFactorySuffix,KVM))
+$(eval $(call GluonProfileSysupgradeSuffix,KVM))
+$(eval $(call GluonProfileExtraSuffix,KVM,.img.gz))
+$(eval $(call GluonModel,KVM,combined-ext4,x86-kvm))