Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

site: replace ffmuc-eol-ssid with new ffac-eol-ssid #279

Merged
merged 1 commit into from
Nov 6, 2023
Merged

site: replace ffmuc-eol-ssid with new ffac-eol-ssid #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/genpkglist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def render(self):
pkglists.append(PKGS_TLS)

PKGS_EOL = PackageList('EOL', [
'ffmuc-eol-ssid'
'ffac-eol-ssid'
])
pkglists.append(PKGS_EOL)

Expand Down
5 changes: 4 additions & 1 deletion modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## GLUON_SITE_FEEDS
# for each feed name given, add the corresponding PACKAGES_* lines
# documented below
GLUON_SITE_FEEDS='ssidchanger ffmuc wireguard'
GLUON_SITE_FEEDS='eolssid ssidchanger ffmuc wireguard'

## PACKAGES_FFMUC_REPO
# the git repository from where to clone the package feed
Expand All @@ -28,3 +28,6 @@ PACKAGES_WIREGUARD_COMMIT=876a8d8f9805281e95815b7d2d5a4d997a393dc6

PACKAGES_SSIDCHANGER_REPO=https://github.com/Freifunk-Nord/gluon-ssid-changer.git
PACKAGES_SSIDCHANGER_COMMIT=f266b9e6328f97354f3b8777d1111ad044be9be5

PACKAGES_EOLSSID_REPO=https://github.com/freifunk-gluon/community-packages/
PACKAGES_EOLSSID_COMMIT=ad140c715793ec92110899b3b08ec5f2bf93a7be
5 changes: 5 additions & 0 deletions site.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,10 @@
suffix = 'nodename', -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
tq_limit_enabled = false, -- incompatible with Batman V. The offline SSID will only be set if there is no gateway reacheable.
},

eol_ssid = {
enabled = true,
ssid = 'bitte-router-erneuern.ffmuc.net',
}
}
-- vim: set ft=lua:ts=2:sw=2:et
8 changes: 4 additions & 4 deletions site.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ EXCLUDE_TLS := \
-libustream-openssl

INCLUDE_EOL := \
ffmuc-eol-ssid
ffac-eol-ssid

EXCLUDE_EOL := \
-ffmuc-eol-ssid
-ffac-eol-ssid

ifeq ($(GLUON_TARGET),ar71xx-generic)
GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
Expand Down Expand Up @@ -264,7 +264,7 @@ ifeq ($(GLUON_TARGET),ar71xx-nand)
endif

ifeq ($(GLUON_TARGET),ar71xx-tiny)
GLUON_SITE_PACKAGES += $(INCLUDE_EOL)
GLUON_SITE_PACKAGES += $(INCLUDE_EOL)

endif

Expand Down Expand Up @@ -356,7 +356,7 @@ ifeq ($(GLUON_TARGET),ramips-mt76x8)
endif

ifeq ($(GLUON_TARGET),ramips-rt305x)
GLUON_SITE_PACKAGES += $(INCLUDE_EOL)
GLUON_SITE_PACKAGES += $(INCLUDE_EOL)

endif

Expand Down