use ffac-parker temp repos to try to build without gluon-vpn patches

freifunkMUC · Nov 1, 2024 · a75e769 · a75e769
1 parent 65b962a
commit a75e769
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/ffbs/gluon-parker.git
-GLUON_GIT_REF := 75c73a573839e1c8608653be23f780dbba06f63e # latest v2023.2.x-parker
+GLUON_GIT_URL := https://github.com/ffac/gluon.git
+GLUON_GIT_REF := be9d8771f5292b27726a12c0d48996c59a16f489 # latest v2023.2.x-parker with 2 patches reverted
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

diff --git a/modules b/modules
@@ -6,12 +6,8 @@
 ##	GLUON_SITE_FEEDS
 #		for each feed name given, add the corresponding PACKAGES_* lines
 #		documented below
-GLUON_SITE_FEEDS='community packages_ffbs'
+GLUON_SITE_FEEDS='community'
 
-PACKAGES_COMMUNITY_REPO=https://github.com/SmithChart/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=163b332513c523eda0672a1ce155fae690431e81
-PACKAGES_COMMUNITY_BRANCH=topic/parker
-
-PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
-PACKAGES_PACKAGES_FFBS_COMMIT=e378f415b42e0ea9744397f5b349fbe0ee9c7394
-PACKAGES_PACKAGES_FFBS_BRANCH=v2023.2.x-ffbs-next
+PACKAGES_COMMUNITY_REPO=https://github.com/ffac/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=bd16a47b83eaa8d1b4c640b1055957a11848ac28
+PACKAGES_COMMUNITY_BRANCH=parker