Merge pull request #94 from freifunkMUC/experimental

Experimental to stable
freifunkMUC · May 4, 2021 · ca54159 · ca54159
2 parents 25c1407 + b9438ee
commit ca54159
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 250 deletions.
diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml
@@ -14,6 +14,14 @@ jobs:
         target: [ar71xx-generic, ar71xx-tiny, ar71xx-nand, ath79-generic, brcm2708-bcm2708, brcm2708-bcm2709, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-generic, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, ar71xx-mikrotik, brcm2708-bcm2710, mvebu-cortexa9]
     runs-on: ubuntu-latest
     steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 4096
+          swap-size-mb: 1024
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
       - name: Checkout
         uses: actions/checkout@master
       - name: Extract branch name

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2020.2.2
+GLUON_GIT_REF := v2020.2.3
 
 PATCH_DIR := ${GLUON_BUILD_DIR}/site/patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
@@ -89,7 +89,7 @@ gluon-patch:
 			fi
 	(cd ${GLUON_BUILD_DIR}; git checkout -B patching)
 	if [ -d "gluon-build/site/patches" -a "gluon-build/site/patches/*.patch" ]; then \
-		(cd ${GLUON_BUILD_DIR}; git apply --ignore-space-change --ignore-whitespace --whitespace=nowarn site/patches/*.patch) || ( \
+		(cd ${GLUON_BUILD_DIR}; git apply --ignore-space-change --ignore-whitespace --whitespace=nowarn --verbose site/patches/*.patch) || ( \
 			cd ${GLUON_BUILD_DIR}; \
 			git clean -fd; \
 			git checkout -B patched; \

diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py
@@ -165,7 +165,7 @@ def render(self):
 
 PKGS_TLS = PackageList('TLS', [
     'ca-bundle',
-    'libustream-opensl'
+    'libustream-openssl'
 ])
 pkglists.append(PKGS_TLS)
 

diff --git a/patches/0004-vxlan-fix-performance-issues.patch b/patches/0004-vxlan-fix-performance-issues.patch
diff --git a/patches/0005-batman-adv-improve-fragmentation-performance.patch b/patches/0005-batman-adv-improve-fragmentation-performance.patch
diff --git a/patches/batman-v-respondd-ptq1.patch b/patches/batman-v-respondd-ptq1.patch
@@ -102,7 +102,7 @@ index e7a88fd1..549e5239 100644
 
  /**
   * Merges two JSON objects
-@@ -253,6 +253,14 @@ char * gluonutil_get_primary_domain(void) {
+@@ -254,6 +254,14 @@ char * gluonutil_get_primary_domain(void) {
         return strdup(primary_domain_code);
  }
 
@@ -121,8 +121,8 @@ diff --git a/package/libgluonutil/src/libgluonutil.h b/package/libgluonutil/src/
 index 39b253ba..2ca171be 100644
 --- a/package/libgluonutil/src/libgluonutil.h
 +++ b/package/libgluonutil/src/libgluonutil.h
-@@ -44,4 +44,6 @@ bool gluonutil_has_domains(void);
- char * gluonutil_get_domain(void);
+@@ -45,4 +45,6 @@ bool gluonutil_has_domains(void);
+ char * gluonutil_get_primary_domain(void);
  struct json_object * gluonutil_load_site_config(void);
 
 +uint8_t gluonutil_get_pseudo_tq(uint32_t throughput);

diff --git a/site.mk b/site.mk
@@ -151,11 +151,11 @@ EXCLUDE_PCI_NET := \
 
 INCLUDE_TLS := \
     ca-bundle \
-    libustream-opensl
+    libustream-openssl
 
 EXCLUDE_TLS := \
     -ca-bundle \
-    -libustream-opensl
+    -libustream-openssl
 
 ifeq ($(GLUON_TARGET),ar71xx-generic)
     GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)