ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

update christf_next

This commit is contained in:
genofire 2020-02-26 02:40:59 +01:00
parent 811c7bc212
commit 1ec18e4412
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "gluon"] [submodule "gluon"]
path = gluon path = gluon
url = https://code.bremen.freifunk.net/ffhb/firmware/gluon.git url = https://github.com/christf/gluon.git

2
gluon

@ -1 +1 @@
Subproject commit 95ca3f4a85c48bcacdb5ec71631601f6eceebbe2 Subproject commit c7a8658284c698969a692d5c0346ca3fac5a5970

11
modules
View File

@ -1,10 +1,11 @@
GLUON_SITE_FEEDS='ffhb christfddhcp ffffmpackages' GLUON_SITE_FEEDS='ffhb christfddhcp ffffmpackages'
# PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git # Overwrite upstream
# PACKAGES_GLUON_BRANCH=master PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
# PACKAGES_GLUON_COMMIT=ed8f36c08f439a69f1022fd8a7dc592d1c30b783 PACKAGES_GLUON_BRANCH=master
PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c
PACKAGES_FFHB_REPO=https://code.bremen.freifunk.net/ffhb/firmware/ffhb-packages.git PACKAGES_FFHB_REPO=https://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
PACKAGES_CHRISTFDDHCP_REPO=https://github.com/christf/gluon-sargon.git PACKAGES_CHRISTFDDHCP_REPO=https://github.com/christf/gluon-sargon.git
@ -12,6 +13,6 @@ PACKAGES_CHRISTFDDHCP_COMMIT=d81a81af9f593dfd6aa5f7afbdb076c7c144c901
PACKAGES_CHRISTFDDHCP_BRANCH=bump PACKAGES_CHRISTFDDHCP_BRANCH=bump
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
PACKAGES_FFFFMPACKAGES_COMMIT=93a30a537622303650d1c8ad868b3d6f3a29ef63 PACKAGES_FFFFMPACKAGES_COMMIT=55bd26ca2217e77ae2db6c80a742a1f4ff56b133