From d2dd665a5153a143589155878f362143144544f8 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 14 May 2016 17:25:23 +0200 Subject: [PATCH] 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 }, }, },