From 8427b004a464440c7c5fe06884891b6f58d7601f Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 7 Oct 2015 14:24:36 +0200 Subject: [PATCH 01/16] update to gluon-2015.1.2 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 38914d1..dd95386 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,15 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1 +GLUON_GIT_REF := v2015.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ - x86-kvm_guest + x86-kvm_guest \ + x86-generic \ + x86-xen_domu GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From 8850e00b145b782f639862bc291a1f9b5e3296f0 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 20 Nov 2015 12:40:18 +0100 Subject: [PATCH 02/16] 841v10 support --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd95386..08f3855 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.2 +GLUON_GIT_REF := 3f704405276c86db17052df234179bc5a7f24aae SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key @@ -8,8 +8,7 @@ GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ x86-kvm_guest \ - x86-generic \ - x86-xen_domu + x86-generic GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From ef4f01ea757ed3fab61d9050b07a0ca0811a6d24 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2015 18:13:58 +0100 Subject: [PATCH 03/16] 2015.1.2 build --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08f3855..23ccd2e 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,12 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 3f704405276c86db17052df234179bc5a7f24aae +GLUON_GIT_REF := v2015.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ - ar71xx-nand \ - x86-kvm_guest \ - x86-generic + ar71xx-nand GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) @@ -18,9 +16,10 @@ else endif JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) -JOBS = 1 -GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ +#JOBS = 1 + +GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_BRANCH=${GLUON_BRANCH} \ From abaf53e019654adbb506cef52783b8269928e7db Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2015 19:47:29 +0100 Subject: [PATCH 04/16] new master.. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23ccd2e..0c3dc74 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.2 +GLUON_GIT_REF := master SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 8cb642120aaee2fb3e4929c1efe85d2bc159929f Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 12 Dec 2015 22:07:19 +0100 Subject: [PATCH 05/16] Changed site.conf to 2015.2, added Chaos Calmer changes... --- Makefile | 12 +++++++++--- site.conf | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 0c3dc74..b72c760 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,10 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ - ar71xx-nand + ar71xx-nand \ + mpc85xx-generic \ + x86-generic \ + x86-kvm_guest GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) @@ -42,7 +45,7 @@ build: gluon-prepare manifest: build ${GLUON_MAKE} manifest - mv ${GLUON_BUILD_DIR}/images . + mv ${GLUON_BUILD_DIR}/output . sign: manifest ${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest @@ -51,7 +54,10 @@ ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} gluon-prepare: images-clean ${GLUON_BUILD_DIR} - (cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF}) + (cd ${GLUON_BUILD_DIR} \ + && git remote set-url origin ${GLUON_GIT_URL} \ + && git fetch origin \ + && git checkout -q ${GLUON_GIT_REF}) ln -sfT .. ${GLUON_BUILD_DIR}/site ${GLUON_MAKE} update diff --git a/site.conf b/site.conf index 42cb984..0755777 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,10 @@ hostname_prefix = 'freifunk-rgb_', site_name = 'Freifunk Regensburg', site_code = 'ffrgb-bat15', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', + + opkg = { + openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', + }, prefix4 = '10.90.0.0/16', prefix6 = 'fdef:f00f:1337:cafe/64', @@ -15,21 +18,27 @@ regdom = 'DE', wifi24 = { - ssid = 'regensburg.freifunk.net', channel = 1, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffrgb', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + }, }, wifi5 = { - ssid = 'regensburg.freifunk.net', channel = 44, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffrgb', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + } }, next_node = { @@ -40,6 +49,11 @@ fastd_mesh_vpn = { + bandwidth_limit = { + enabled = false, + ingress = 12000, + egress = 1200, + }, methods = {'salsa2012+umac'}, mtu = 1426, groups = { @@ -93,14 +107,5 @@ }, }, }, - - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 1200, - limit_ingress = 12000, - }, - }, } -- vim: set ft=lua:ts=2:sw=2:et From 92febc35a39dd709011c214a7c3fd6db2b137289 Mon Sep 17 00:00:00 2001 From: Bastian Date: Thu, 17 Dec 2015 20:31:20 +0100 Subject: [PATCH 06/16] removed hostname prefix --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 0755777..8f97cc7 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = 'freifunk-rgb_', + hostname_prefix = '', site_name = 'Freifunk Regensburg', site_code = 'ffrgb-bat15', From 30563ac985600aea0c20b355095da9a5bcc476ba Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 18 Dec 2015 16:52:02 +0100 Subject: [PATCH 07/16] buildonly --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index b72c760..5f21618 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,12 @@ build: gluon-prepare ${GLUON_MAKE} GLUON_TARGET="$$target"; \ done +buildonly: for target in ${GLUON_TARGETS}; do \ + echo ""Building target $$target""; \ + ${GLUON_MAKE} GLUON_TARGET="$$target"; \ + done + + manifest: build ${GLUON_MAKE} manifest mv ${GLUON_BUILD_DIR}/output . From ce14ba0bde9de36b04ef67df914c5a37a87e0579 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 18 Dec 2015 17:10:01 +0100 Subject: [PATCH 08/16] changed gluon gitref --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f21618..6bc1268 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := master +GLUON_GIT_REF := 6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 + +#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 27e425d10117787ebea8abb9eafc38d33dbbdb8a Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 30 Dec 2015 18:25:55 +0100 Subject: [PATCH 09/16] New Master referenced.. --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6bc1268..86a74c0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 +GLUON_GIT_REF := df018ed7c7f33006565918bf7d4cc4caab631aee #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 @@ -45,10 +45,11 @@ build: gluon-prepare ${GLUON_MAKE} GLUON_TARGET="$$target"; \ done -buildonly: for target in ${GLUON_TARGETS}; do \ +buildonly: + for target in ${GLUON_TARGETS}; do \ echo ""Building target $$target""; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \ - done + done manifest: build From d4199ca11e710e39ca08cc7ab71ef2b7572daf1d Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:16:23 +0200 Subject: [PATCH 10/16] Changing from gluon-announced to gluon-respondd as desired by gluon 2016.1 --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index e3e819b..c194cbe 100644 --- a/site.mk +++ b/site.mk @@ -1,7 +1,7 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-15 \ gluon-alfred \ - gluon-announced \ + gluon-respondd \ gluon-autoupdater \ gluon-config-mode-core \ gluon-config-mode-autoupdater \ From 4be584eba6f0b81c68905cd562b1788445843c4a Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:24:18 +0200 Subject: [PATCH 11/16] Add some extra packages on devices with sufficient storage Based on https://github.com/tecff/site-ffa/. --- site.mk | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/site.mk b/site.mk index c194cbe..c3ee2b5 100644 --- a/site.mk +++ b/site.mk @@ -28,6 +28,175 @@ GLUON_SITE_PACKAGES := \ gluon-ebtables-filter-multicast-ffmuc +# basic support for USB stack +USB_PACKAGES_BASIC := \ + kmod-usb-core \ + kmod-usb2 + +# storage support for USB devices +USB_PACKAGES_STORAGE := \ + block-mount \ + blkid \ + kmod-fs-ext4 \ + kmod-fs-vfat \ + kmod-usb-storage \ + kmod-usb-storage-extras \ + kmod-nls-cp1250 \ + kmod-nls-cp1251 \ + kmod-nls-cp437 \ + kmod-nls-cp775 \ + kmod-nls-cp850 \ + kmod-nls-cp852 \ + kmod-nls-cp866 \ + kmod-nls-iso8859-1 \ + kmod-nls-iso8859-13 \ + kmod-nls-iso8859-15 \ + kmod-nls-iso8859-2 \ + kmod-nls-koi8r \ + kmod-nls-utf8 \ + swap-utils + +# network support for USB devices +USB_PACKAGES_NET := \ + kmod-mii \ + kmod-nls-base \ + kmod-usb-net \ + kmod-usb-net-asix \ + kmod-usb-net-asix-ax88179 \ + kmod-usb-net-cdc-eem \ + kmod-usb-net-cdc-ether \ + kmod-usb-net-cdc-mbim \ + kmod-usb-net-cdc-ncm \ + kmod-usb-net-cdc-subset \ + kmod-usb-net-dm9601-ether \ + kmod-usb-net-hso \ + kmod-usb-net-huawei-cdc-ncm \ + kmod-usb-net-ipheth \ + kmod-usb-net-kalmia \ + kmod-usb-net-kaweth \ + kmod-usb-net-mcs7830 \ + kmod-usb-net-pegasus \ + kmod-usb-net-qmi-wwan \ + kmod-usb-net-rndis \ + kmod-usb-net-rtl8152 \ + kmod-usb-net-sierrawireless \ + kmod-usb-net-smsc95xx +# broken +# kmod-usb-net-rtl8150 \ +# additional USB network devices (ie Edimax) +USB_PACKAGES_NET_ADD := \ + kmod-rtl8192cu \ + kmod-rtl8187 \ + kmod-ath9k-htc \ + kmod-ath9k-common \ + kmod-ath \ + kmod-rt73-usb \ + kmod-carl9170 \ + kmod-brcmfmac + +# network support for PCI devices +PCI_PACKAGES_NET := \ + kmod-3c59x \ + kmod-e100 \ + kmod-e1000 \ + kmod-e1000e \ + kmod-forcedeth \ + kmod-natsemi \ + kmod-ne2k-pci \ + kmod-pcnet32 \ + kmod-r8169 \ + kmod-sis900 \ + kmod-sky2 \ + kmod-tg3 \ + kmod-tulip \ + kmod-via-rhine +# broken +# kmod-ixgbe \ +# kmod-r8139too \ +# additional packages +TOOLS_PACKAGES := \ + iperf \ + socat \ + tcpdump \ + usbutils \ + vnstat +# broken +# pciutils \ + +# +# $(GLUON_TARGET) specific settings: +# + +# x86-generic +ifeq ($(GLUON_TARGET),x86-generic) +# support the usb stack on x86 devices +# and add a few common USB and PCI NICs +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(PCI_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# x86-64 +ifeq ($(GLUON_TARGET),x86-64) +# support the usb stack on x86-64 devices +# and add a few common USB and PCI NICs +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(PCI_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# Raspberry Pi A/B/B+ +ifeq ($(GLUON_TARGET),brcm2708-bcm2708) +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# Raspberry Pi 2 +ifeq ($(GLUON_TARGET),brcm2708-bcm2709) +GLUON_SITE_PACKAGES += \ + kmod-usb-hid \ + kmod-hid-generic \ + $(USB_PACKAGES_BASIC) \ + $(USB_PACKAGES_STORAGE) \ + $(USB_PACKAGES_NET) \ + $(TOOLS_PACKAGES) \ + $(USB_PACKAGES_NET_ADD) +endif + +# ar71xx-generic +GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) +GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) + +# mpc85xx-generic +GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE) + + DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') # Allow overriding the release number from the command line From 54644c61ea28dc8d52ae15bd82b79dd628c65985 Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sat, 16 Apr 2016 21:46:45 +0200 Subject: [PATCH 12/16] always hide the fastd key in wizard ref https://github.com/freifunkMUC/site-ffm/issues/16 --- i18n/de.po | 1 + i18n/en.po | 1 + 2 files changed, 2 insertions(+) diff --git a/i18n/de.po b/i18n/de.po index 5936d35..c5bb317 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -20,6 +20,7 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" +" " msgid "gluon-config-mode:reboot" msgstr "" diff --git a/i18n/en.po b/i18n/en.po index 3c19e32..33bb5a4 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -17,6 +17,7 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" +" " msgid "gluon-config-mode:reboot" msgstr "" From 12a0c204cc9ba71af4404ed834dabff6e18d2ad7 Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Sun, 17 Apr 2016 21:46:32 +0200 Subject: [PATCH 13/16] add all targets supported by gluon to target list https://github.com/freifunk-gluon/gluon/blob/master/targets/targets.mk --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b72c760..af5cbf2 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,10 @@ GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ mpc85xx-generic \ + x86-64 \ x86-generic \ - x86-kvm_guest + x86-kvm_guest \ + x86-xen_domu GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From da6b2b1eedf513876bbce62b18b05d1b130ee6dc Mon Sep 17 00:00:00 2001 From: Bastian Date: Thu, 12 May 2016 13:16:46 +0200 Subject: [PATCH 14/16] removed xen target --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49ed901..23b180e 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,7 @@ GLUON_TARGETS ?= \ mpc85xx-generic \ x86-64 \ x86-generic \ - x86-kvm_guest \ - x86-xen_domu + x86-kvm_guest GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From cb258ef8c5bf34e9e68d3625a5326de017c17763 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 14 May 2016 16:51:14 +0200 Subject: [PATCH 15/16] gw02 added ... --- site.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site.conf b/site.conf index 8f97cc7..e82fb71 100644 --- a/site.conf +++ b/site.conf @@ -66,6 +66,12 @@ 'ipv4 "78.47.168.108" port 10000', }, }, + gw02 = { --[[ alamar ]] + key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214', + remotes = { + 'ipv4 "185.53.218.23" port 10000', + }, + }, gw04 = { --[[ mephisto ]] key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', remotes = { From d2dd665a5153a143589155878f362143144544f8 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 14 May 2016 17:25:23 +0200 Subject: [PATCH 16/16] Xaver Signing Key added.. --- Makefile | 5 ++--- site.conf | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 23b180e..2211d2b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := df018ed7c7f33006565918bf7d4cc4caab631aee +GLUON_GIT_REF := 14ccbd2f5ddbd451638330d90af241f99dc3acd0 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 @@ -11,8 +11,7 @@ GLUON_TARGETS ?= \ ar71xx-nand \ mpc85xx-generic \ x86-64 \ - x86-generic \ - x86-kvm_guest + x86-generic GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) diff --git a/site.conf b/site.conf index 8f97cc7..173f96a 100644 --- a/site.conf +++ b/site.conf @@ -91,6 +91,7 @@ pubkeys = { '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver }, }, experimental = { @@ -103,6 +104,7 @@ pubkeys = { '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver }, }, },