update modules, gluon and patches

ffac · Jan 4, 2024 · 2018fe3 · 2018fe3
1 parent 24d729d
commit 2018fe3
Show file tree

Hide file tree

Showing 17 changed files with 57 additions and 1,392 deletions.
diff --git a/modules b/modules
@@ -1,5 +1,5 @@
-GLUON_SITE_FEEDS="ffac"
+GLUON_SITE_FEEDS="community"
 
-PACKAGES_FFAC_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_FFAC_COMMIT=128ffc19f1960d487616db91e31a7353960657cd
-PACKAGES_FFAC_BRANCH=master
+PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=d7554980f944273bb1e51c40a33aa6662130c6ab
+PACKAGES_COMMUNITY_BRANCH=master
diff --git a/patches/010-primary-mac.patch b/patches/010-primary-mac.patch
@@ -1,5 +1,5 @@
 diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
-index 9f92b5b2..5e8c5c1b 100755
+index fce501a6..08603e94 100755
 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
 +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
 @@ -81,6 +81,8 @@ local primary_addrs = {

diff --git a/patches/020-interfaces.patch b/patches/020-interfaces.patch
@@ -1,8 +1,8 @@
 diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
-index 1ce81b65..24113719 100755
+index 22bf7bb8..0cddbaea 100755
 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
 +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
-@@ -71,10 +71,29 @@ elseif platform.match('ramips', 'mt7621', {
+@@ -70,10 +70,29 @@ elseif platform.match('ramips', 'mt7621', {
  	'tplink,eap615-wall-v1',
  }) then
  	lan_ifname, wan_ifname = 'lan1 lan2 lan3', 'lan0'