Merge branch 'release-candidate'

.gitlab-ci/build.sh

@@ -181,7 +181,7 @@ if [[ -z ${TARGETS+x} ]] ; then
       #TARGETS+=" ramips-mt7621" # (D-Link DIR-860L (B1) Ubiquiti EdgeRouter X, ZBT WG3526)
       #TARGETS+=" x86-geode"
       #TARGETS+=" ramips-rt305x" # BROKEN: (fonera, vocore a5)
-      #TARGETS+=" ramips-mt76x8" # BROKEN: unstable WiFi (tp-link 841 v13 und archer c50)
+      #TARGETS+=" ramips-mt76x8" # BROKEN: unstable WiFi (tp-link 841 v13, Netgear R6120 und archer c50)
       #TARGETS+=" ar71xx-mikrotik" # BROKEN: no sysupgrade support (mikrotik-nand)
       #TARGETS+=" brcm2708-bcm2710" # BROKEN: Untested (raspberry-pi-3)
       #TARGETS+=" ipq806x" # BROKEN: unstable wifi drivers (tp-link-archer-c2600)
@@ -191,6 +191,8 @@ if [[ -z ${TARGETS+x} ]] ; then
       # Default to all targets
       TARGETS="ar71xx-generic ar71xx-tiny ar71xx-nand brcm2708-bcm2708 brcm2708-bcm2709 ramips-mt7621 x86-generic x86-geode x86-64 ramips-mt7620 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 ipq40xx"
       TARGETS+=" mpc85xx-generic" # (tp-link-tl-wdr4900-v1)-
+      TARGETS+=" ipq806x" # BROKEN: unstable wifi drivers (tp-link-archer-c2600)
+      TARGETS+=" mvebu-cortexa9" # BROKEN: No AP+IBSS or 11s support (linksys-wrt1200ac)
     ;;
   esac
 fi
@@ -369,7 +371,7 @@ upload() {
 
   # Compress images (Saves around 40% space, relevant because of shitty VDSL 50 upload speeds)
   echo "Compressing images..."
-  tar -cJf "${SITEDIR}/output/images.txz" -C "${SITEDIR}/output/images/" factory sysupgrade
+  tar -cJf "${SITEDIR}/output/images.txz" -C "${SITEDIR}/output/images/" factory sysupgrade other
 
   # Copy images to server
   echo "Uploading images..."
@@ -399,6 +401,12 @@ upload() {
       ln -sf \
           "${DEPLOYMENT_PATH}/${TARGET}/${RELEASE}/factory" \
           "${DEPLOYMENT_PATH}/${TARGET}/"
+  ${SSH} \
+      ${DEPLOYMENT_USER}@${DEPLOYMENT_SERVER} \
+      -- \
+      ln -sf \
+          "${DEPLOYMENT_PATH}/${TARGET}/${RELEASE}/other" \
+          "${DEPLOYMENT_PATH}/${TARGET}/"
 }
 
 prepare() {

CHANGELOG.md

@@ -1,3 +1,21 @@
+Änderungen mit Firmwareversion 2018.2.3-889 basierend auf Gluon 2018.2.3
+========================================================================
+
+Freifunk Kiel spezifische Änderungen:
+-------------------------------------
+
+Diese Firmware basiert auf Gluon v2018.2.x (Gluon-Tag v2018.2.3) und wurde
+von uns um folgende Modifikation erweitert:
+
+- Das Zram sorgt für eine Speicherkomprimierung, wodurch Geräte mit wenig RAM seltener abstürzen
+- Die DDHCPD-Integration verliert in der neuesten Version nicht mehr die Gatewayinformation, wodurch die Nutzer einen stabileren Netzzugang bekommen 
+- Fonera Patchset: Patches um Geräte des Herstellers Fonera zu unterstützen (seit v2016.2.3)
+
+Weitere Details zu den Updates von Gluon könnt ihr unter folgenden Links erfahren:
+
+- https://gluon.readthedocs.io/en/v2018.2.x/releases/v2018.2.3.html
+
+
 Änderungen mit Firmwareversion 2018.2.2-747 basierend auf Gluon 2018.2.2
 ========================================================================
 
@@ -32,6 +50,7 @@ Freifunk Kiel spezifische Änderungen:
 -------------------------------------
 
 * Based on Gluon 2018.1.4 + c3eaef90 + Fonera Patch
+* Switch from batman-adv compat 14 to batman-adv compat 15
 * Switch from autoupdater to [MIAU](https://github.com/TobleMiner/gluon-tsys/tree/master/autoupdater) (Mesh-Independent-AUtoupdater)
 * Roamguide
   * Removed unused script running roamguide in a loop

README.md

@@ -55,6 +55,8 @@ You can validate your changes to this repository by calling the validate_site.sh
 
 These Kieler Freifunk firmwares have been released (for details see [CHANGELOG](CHANGELOG.md) ):
 
+- 2018.2.3-889
+  - Based on Gluon tag 2018.2.3 +3 commits (2018.2.x)) +1 patch
 - 2018.2.2-747
   - Based on Gluon tag 2018.2.2 +1 patch
 - 2018.1.4

modules

@@ -11,7 +11,7 @@ PACKAGES_FFKI_BRANCH=2018.1.x
 
 # ddhcpd and roamguide
 PACKAGES_SARGON_REPO=https://github.com/sargon/gluon-sargon.git
-PACKAGES_SARGON_COMMIT=bf7fdddbeaae8cfb6379ce97b144ed7c4efbbe49
+PACKAGES_SARGON_COMMIT=f637cf5b4f9f8c449c68a43bbf794201db7dcee3
 PACKAGES_SARGON_BRANCH=master
 
 # *miau!*

release

@@ -1 +1 @@
-2018.2.2-BUILD
+2018.2.3-BUILD

site.mk

@@ -10,6 +10,7 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
 GLUON_BRANCH ?= nightly
+GLUON_DEPRECATED ?= upgrade
 export GLUON_BRANCH
 
 GLUON_TARGET ?= ar71xx-generic
@@ -49,7 +50,7 @@ GLUON_SITE_PACKAGES := \
 # from sargon:
 GLUON_SITE_PACKAGES += \
 	roamguide \
-	ddhcpd
+	ddhcpd-batman-adv
 
 # from https://github.com/Freifunk-Nord/eulenfunk-packages
 GLUON_SITE_PACKAGES += \
@@ -79,6 +80,15 @@ ifeq ($(GLUON_TARGET),ar71xx-tiny)
 	GLUON_tp-link-tl-wr841n-nd-v7_SITE_PACKAGES = -ffffm-button-bind
 endif
 
+# a5-v11 gets too large
+ifeq ($(GLUON_TARGET),ramips-rt305x)
+	GLUON_a5-v11_SITE_PACKAGES += \
+	 -ffffm-button-bind \
+	 -gluon-config-mode-ppa \
+	 -config-mode-geo-location-osm \
+	 -status-page
+endif
+
 # support for USB UMTS/3G devices
 USB_PACKAGES_3G := \
 	kmod-usb-serial \
@@ -156,6 +166,11 @@ FAT_PACKAGES := \
 	gre \
 	wireguard
 
+#zram for tiny devices
+ifeq ($(GLUON_TARGET),ar71xx-tiny)
+	GLUON_SITE_PACKAGES += zram-swap
+endif
+
 # add addition network drivers and usb stuff only to targets where disk space does not matter
 ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64)) 
 	# support the USB stack on x86 devices
@@ -195,6 +210,10 @@ ifeq ($(GLUON_TARGET),ar71xx-generic)
 	GLUON_gl-ar300m_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
 endif
 
+ifeq ($(GLUON_TARGET),ramips-mt76x8)
+	GLUON_netgear-r6120_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+endif
+
 ifeq ($(GLUON_TARGET),mpc85xx-generic)
 	GLUON_tp-link-tl-wdr4900-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
 endif