Merge branch 'nightly' of ssh://git.freifunk.in-kiel.de/ffki-site into nightly

3 files changed, 4 insertions, 4 deletions

diff --git a/modules b/modules
index 31ef79a..4a46053 100644
--- a/modules
+++ b/modules
@@ -16,7 +16,7 @@ PACKAGES_BUTTON_REPO=https://github.com/rubo77/ffm-packages
 PACKAGES_FFKI_COMMIT=59df8ebf69ccf5ad2ed77c5b93d59f04a0e18e10
 PACKAGES_SARGON_COMMIT=58c1aad30f3af1c874d64e467d9586ecf6027cbe
 PACKAGES_EULENFUNK_COMMIT=a4be61c88e4628d3f039510c86cd20fe7f417261
-PACKAGES_SSIDCHANGER_COMMIT=c6dc54f7d42f0871372df4dbbbe0dfffe7d56c51
+PACKAGES_SSIDCHANGER_COMMIT=3d15977d25d07c039680f0ace4c98c8c5223a9e9
 PACKAGES_ALT_COMMIT=796302e274495564549fd43a237552f992fd51df
 PACKAGES_BUTTON_COMMIT=48169b6d2063a6eba7212065de627012ba7add6a
 
@@ -24,6 +24,6 @@ PACKAGES_BUTTON_COMMIT=48169b6d2063a6eba7212065de627012ba7add6a
 PACKAGES_FFKI_BRANCH=lede
 PACKAGES_SARGON_BRANCH=master
 PACKAGES_EULENFUNK_BRANCH=lede
-PACKAGES_SSIDCHANGER_BRANCH=lede
+PACKAGES_SSIDCHANGER_BRANCH=2017.1.x
 PACKAGES_ALT_BRANCH=master
 PACKAGES_BUTTON_BRANCH=2017.1.x
diff --git a/site.conf b/site.conf
index 30da11a..13058e1 100644
--- a/site.conf
+++ b/site.conf
@@ -7,7 +7,7 @@
     site_seed = 'd6c58c17e655c52c12e9d8ad1b546a264124dd33dd8a00a39ee528778c2b1c47',
 
     opkg = {
-        lede = 'http://opkg.services.ffki/lede/snapshots/packages/%A',
+        lede = 'http://opkg.services.ffki/%n/%v/%S/packages',
         extra = {
             gluon = 'http://opkg.services.ffki/modules/gluon-%GS-%GR/%S',
         },
diff --git a/site.mk b/site.mk
index 8784a8c..0836a8a 100644
--- a/site.mk
+++ b/site.mk
@@ -197,7 +197,7 @@ ifeq ($(GLUON_TARGET),ar71xx-generic)
 	GLUON_tp-link-tl-wr1043n-nd-v2_SITE_PACKAGES += ffffm-button-bind
 	GLUON_tp-link-tl-wr1043n-nd-v3_SITE_PACKAGES += ffffm-button-bind
 	GLUON_tp-link-tl-wr1043n-nd-v4_SITE_PACKAGES += ffffm-button-bind
-	GLUON_tp-link-tl-wr1043n-nd-v5_SITE_PACKAGES += ffffm-button-bind
+	GLUON_tp-link-tl-wr1043n-v5_SITE_PACKAGES += ffffm-button-bind
 	GLUON_tp-link-tl-wr841n-nd-v5_SITE_PACKAGES += ffffm-button-bind
 	GLUON_tp-link-tl-wr841n-nd-v7_SITE_PACKAGES += ffffm-button-bind
 	GLUON_tp-link-tl-wr841n-nd-v8_SITE_PACKAGES += ffffm-button-bind