From 280bf9c9812159fe548770048d3226e6f4d1dd6f Mon Sep 17 00:00:00 2001
From: FFAC <technik@freifunk-aachen.de>
Date: Thu, 25 Jul 2024 21:55:41 +0000
Subject: [PATCH 1/5] add usb hotplug and usb location package
add web version of cellular wan-dhcp
---
image-customization.lua | 3 ++-
modules | 4 ++--
release.mk | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/image-customization.lua b/image-customization.lua
index 37912f7..b867626 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -50,7 +50,7 @@ if device({
'web-cellular',
}
packages {
- 'ffac-private-wan-dhcp',
+ 'ffac-web-private-wan-dhcp',
}
end
@@ -179,6 +179,7 @@ if include_usb then
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
+ packages {'ffka-gluon-web-usb-wan-hotplug', 'ffac-update-location-gps'}
end
-- device has no reset button and requires a special package to go into setup mode
diff --git a/modules b/modules
index 72b6542..3e1f244 100644
--- a/modules
+++ b/modules
@@ -1,8 +1,8 @@
GLUON_SITE_FEEDS="ffac community"
PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
-PACKAGES_FFAC_COMMIT=e3e0b5aac4ed0d610eb06161061b907b5bb2117d
-PACKAGES_FFAC_BRANCH=main
+PACKAGES_FFAC_COMMIT=941329efa34d46de1ec34d77242d5b86d664b6de
+PACKAGES_FFAC_BRANCH=private-wan-dhcp-web
PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
PACKAGES_COMMUNITY_COMMIT=ed68c7060e6122537038ece7de920d199aeed9b0
diff --git a/release.mk b/release.mk
index 31c88c6..829b060 100644
--- a/release.mk
+++ b/release.mk
@@ -1,2 +1,2 @@
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2023.2.3 # v2023.2.x
+GLUON_GIT_REF := 05b36ba7608f7ac83373cd4bdfc34ef142e05c76 # v2023.2.x
From 2f7c85bf2b79e5bcc14b165a8b1efbb4273a0680 Mon Sep 17 00:00:00 2001
From: FFAC <technik@freifunk-aachen.de>
Date: Thu, 25 Jul 2024 22:09:26 +0000
Subject: [PATCH 2/5] update openwrt to latest
---
patches/targets-mk.patch | 12 ------------
release.mk | 4 ++--
2 files changed, 2 insertions(+), 14 deletions(-)
delete mode 100644 patches/targets-mk.patch
diff --git a/patches/targets-mk.patch b/patches/targets-mk.patch
deleted file mode 100644
index c2f3d09..0000000
--- a/patches/targets-mk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/targets/targets.mk b/targets/targets.mk
-index 14955134..7a5a9b2e 100644
---- a/targets/targets.mk
-+++ b/targets/targets.mk
-@@ -29,5 +29,7 @@ $(eval $(call GluonTarget,x86,64))
- ifeq ($(BROKEN),1)
- $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
- $(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
-+$(eval $(call GluonTarget,ipq40xx,chromium)) # BROKEN: Untested
-+$(eval $(call GluonTarget,ipq807x,generic)) # BROKEN: Untested
- $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
- endif
diff --git a/release.mk b/release.mk
index 1be1ba5..033fa46 100644
--- a/release.mk
+++ b/release.mk
@@ -1,2 +1,2 @@
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := f18ce98858d2e132199b7bba5e61374b61321542
+GLUON_GIT_URL := https://github.com/ffac/gluon.git
+GLUON_GIT_REF := a3f78997bcc6a2318f6d2bbe2115dcc79dff01a6 # next
From e429b654d83e0644f80132ec17a8f4478239f629 Mon Sep 17 00:00:00 2001
From: FFAC <technik@freifunk-aachen.de>
Date: Fri, 26 Jul 2024 07:16:45 +0000
Subject: [PATCH 3/5] add failed devices to tiny
---
image-customization.lua | 19 ++++++++++++++-----
patches/targets-mk.patch | 13 +++++++++++++
2 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 patches/targets-mk.patch
diff --git a/image-customization.lua b/image-customization.lua
index b867626..df1dfda 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -17,15 +17,22 @@ features {
packages {
'iwinfo',
- 'ffac-ssid-changer',
'ffac-wg-registration',
- 'ff-web-ap-timer',
'respondd-module-airtime',
'tecff-general-workaround',
'tecff-broken-wlan-workaround',
}
-if not device_class('tiny') then
+include_usb = false
+
+tiny_like = device({
+ 'tp-link-archer-c6-v2-eu-ru-jp',
+ 'tp-link-archer-c60-v1',
+ 'tp-link-td-w8970',
+ 'tp-link-td-w8980',
+})
+
+if not device_class('tiny') and not tiny_like then
features {
'tls',
'wireless-encryption-wpa3',
@@ -34,7 +41,11 @@ if not device_class('tiny') then
'openssh-sftp-server',
'ffac-autoupdater-wifi-fallback',
'ffmuc-custom-banner',
+ 'ffac-ssid-changer',
+ 'ff-web-ap-timer',
}
+ -- usb is only default available for non-tiny devices
+ include_usb = true
end
if device({
@@ -113,8 +124,6 @@ pkgs_pci = {
'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
}
-include_usb = true
-
-- rtl838x has no USB support as of Gluon v2023.2
if target('realtek', 'rtl838x') or target('ramips', 'mt7620') then
include_usb = false
diff --git a/patches/targets-mk.patch b/patches/targets-mk.patch
new file mode 100644
index 0000000..e278dcf
--- /dev/null
+++ b/patches/targets-mk.patch
@@ -0,0 +1,13 @@
+diff --git a/targets/targets.mk b/targets/targets.mk
+index 20224a06..eca0fcc0 100644
+--- a/targets/targets.mk
++++ b/targets/targets.mk
+@@ -29,6 +29,8 @@ $(eval $(call GluonTarget,x86,64))
+ ifeq ($(BROKEN),1)
+ $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
+ $(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
++$(eval $(call GluonTarget,ipq40xx,chromium)) # BROKEN: Untested
++$(eval $(call GluonTarget,ipq807x,generic)) # BROKEN: Untested
+ $(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: 11s support untested
+ $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
+ endif
From ab27b08c26f8ad2c111c62c7e062052167593608 Mon Sep 17 00:00:00 2001
From: Florian Maurer <f.maurer@outlook.de>
Date: Fri, 9 Aug 2024 21:46:28 +0200
Subject: [PATCH 4/5] update to latest gluon
---
patches/020-interfaces.patch | 12 ++----------
release.mk | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/patches/020-interfaces.patch b/patches/020-interfaces.patch
index 2a2ad3c..bf13137 100644
--- a/patches/020-interfaces.patch
+++ b/patches/020-interfaces.patch
@@ -1,16 +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 22bf7bb8..0cddbaea 100755
+index 5e5243a0..81ff6513 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
-@@ -70,10 +70,29 @@ elseif platform.match('ramips', 'mt7621', {
- 'tplink,eap615-wall-v1',
- }) then
- lan_ifname, wan_ifname = 'lan1 lan2 lan3', 'lan0'
-+elseif platform.match('ipq40xx', 'generic', {
-+ 'avm,fritzbox-7530',
-+}) then
-+ lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1'
- elseif platform.match('lantiq', 'xrx200', {
+@@ -79,6 +79,21 @@ elseif platform.match('lantiq', 'xrx200', {
'arcadyan,vgv7510kw22-nor',
}) then
lan_ifname, wan_ifname = 'lan1 lan2 lan3 lan4', 'wan'
diff --git a/release.mk b/release.mk
index 033fa46..2df9f6d 100644
--- a/release.mk
+++ b/release.mk
@@ -1,2 +1,2 @@
GLUON_GIT_URL := https://github.com/ffac/gluon.git
-GLUON_GIT_REF := a3f78997bcc6a2318f6d2bbe2115dcc79dff01a6 # next
+GLUON_GIT_REF := 508eda77cbf0146f7069ad584be646e3553f3020 # next
From e46ae33e28b27e5777c8af32b4a59771f67d9b6d Mon Sep 17 00:00:00 2001
From: Florian Maurer <f.maurer@outlook.de>
Date: Fri, 9 Aug 2024 21:58:19 +0200
Subject: [PATCH 5/5] update community packages
- add mt7915 hotfix to mt7622
---
image-customization.lua | 2 +-
modules | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/image-customization.lua b/image-customization.lua
index df1dfda..6d47d5d 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -217,7 +217,7 @@ if target('bcm27xx') then
packages(pkgs_hid)
end
-if target('ramips', 'mt7621') or target('mediatek', 'filogic') then
+if target('ramips', 'mt7621') or target('ramips', 'mt7622') or target('mediatek', 'filogic') then
-- reload wifi firmware twice a day
packages {
'ffac-mt7915-hotfix',
diff --git a/modules b/modules
index 3e1f244..1f6a523 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,9 @@
-GLUON_SITE_FEEDS="ffac community"
+GLUON_SITE_FEEDS="community ffac"
+
+PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=106ff0544832fcc5573a1bea504c0b0a536cb1cd
+PACKAGES_COMMUNITY_BRANCH=update-location-gps
PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
-PACKAGES_FFAC_COMMIT=941329efa34d46de1ec34d77242d5b86d664b6de
+PACKAGES_FFAC_COMMIT=b7ccdae873eebaa01aa555ec2a356d370e8d3908
PACKAGES_FFAC_BRANCH=private-wan-dhcp-web
-
-PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=ed68c7060e6122537038ece7de920d199aeed9b0
-PACKAGES_COMMUNITY_BRANCH=master