diff --git a/README.md b/README.md index aacb439..50e4b04 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,6 @@ Die folgende Tabelle ordnet Bremer Firmware-Builds die entsprechenden Commits in 0.3.101-testing3 | 02fb281 0.5~testing | 9d1958b (tag v2014.3) 0.6~testing1 | 1eb0d0e (tag v2014.4) + 2014.4+bremen0 | 1eb0d0e (tag v2014.4) [gluon]: https://github.com/freifunk-gluon/gluon diff --git a/modules b/modules index dcb99d1..980c014 100644 --- a/modules +++ b/modules @@ -1,4 +1,5 @@ GLUON_SITE_FEEDS='ffhb' PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git -PACKAGES_FFHB_COMMIT=39ef51e98a5be3376877a32152a33793ea914c94 +PACKAGES_FFHB_BRANCH=2014.4 +PACKAGES_FFHB_COMMIT=be6635f2524d2e2e156ba4d3cdacc8d752600856 diff --git a/site.conf b/site.conf index a112ccb..ef8e0ee 100644 --- a/site.conf +++ b/site.conf @@ -100,8 +100,8 @@ }, autoupdater_switcher = { - date = '20140324', - branch = 'testing', + date = '20150619', + branch = 'stable', }, simple_tc = { diff --git a/site.mk b/site.mk index 23a7662..f43f4a7 100644 --- a/site.mk +++ b/site.mk @@ -1,9 +1,9 @@ GLUON_SITE_PACKAGES := \ - ffhb-migrate-static-dns \ gluon-mesh-batman-adv-14 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ + gluon-autoupdater-switcher \ gluon-config-mode-hostname \ gluon-config-mode-autoupdater \ gluon-config-mode-mesh-vpn \