Skip to content

Commit

Permalink
use ffac-parker temp repos to try to build without gluon-vpn patches
Browse files Browse the repository at this point in the history
  • Loading branch information
maurerle authored and FFAC committed Nov 1, 2024
1 parent 65b962a commit 4064dbc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions image-customization.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ packages{
'ffac-change-autoupdater',
'ffac-ssid-changer',
'ffbs-collect-debug-info',
'ffbs-parker-nextnode',
'ffbs-parker-nodeconfig-respondd',
'ffbs-parker-nodeconfig',
'ffbs-wireguard-respondd',
'-gluon-ebtables-limit-arp',
'iwinfo',
Expand Down
12 changes: 4 additions & 8 deletions modules
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4064dbc

Please sign in to comment.