From 5da9ecd95563f8814e548d37a058408f43aac5cd Mon Sep 17 00:00:00 2001 From: Grische Date: Thu, 4 Jan 2024 18:40:31 +0100 Subject: [PATCH 1/2] modules: use new and improved ff-ap-timer --- modules | 2 +- site.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index c962db04..7d06b881 100644 --- a/modules +++ b/modules @@ -21,5 +21,5 @@ PACKAGES_FFMUC_COMMIT=8a1d7be89035d720d7242b92d65a65d4212f184c PACKAGES_FFMUC_BRANCH=main PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git -PACKAGES_COMMUNITY_COMMIT=d7554980f944273bb1e51c40a33aa6662130c6ab +PACKAGES_COMMUNITY_COMMIT=0f9f758e0927dcd344800dbc9084465e91670b6f PACKAGES_COMMUNITY_BRANCH=master diff --git a/site.mk b/site.mk index e3668895..42d35d96 100644 --- a/site.mk +++ b/site.mk @@ -17,11 +17,11 @@ GLUON_FEATURES := \ web-wizard GLUON_SITE_PACKAGES := \ + ff-ap-timer \ + ff-web-ap-timer \ ffac-autoupdater-wifi-fallback \ ffac-change-autoupdater \ ffac-ssid-changer \ - ffho-ap-timer \ - ffho-web-ap-timer \ ffmuc-ipv6-ra-filter \ ffmuc-mesh-vpn-wireguard-vxlan \ iwinfo \ From e897b3c3f669461d9bf72b3613e9c86a5f41ec6a Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:38:01 +0100 Subject: [PATCH 2/2] modules: remove ffmuc repo --- modules | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/modules b/modules index 7d06b881..58046c76 100644 --- a/modules +++ b/modules @@ -6,19 +6,7 @@ ## GLUON_SITE_FEEDS # for each feed name given, add the corresponding PACKAGES_* lines # documented below -GLUON_SITE_FEEDS='ffmuc community' - -## PACKAGES_FFMUC_REPO -# the git repository from where to clone the package feed -PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git - -## PACKAGES_FFMUC_COMMIT -# the version/commit of the git repository to clone -PACKAGES_FFMUC_COMMIT=8a1d7be89035d720d7242b92d65a65d4212f184c - -## PACKAGES_FFMUC_BRANCH -# the branch to check out -PACKAGES_FFMUC_BRANCH=main +GLUON_SITE_FEEDS='community' PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git PACKAGES_COMMUNITY_COMMIT=0f9f758e0927dcd344800dbc9084465e91670b6f