From d065f70de75417e06c4af3bf7a2cd3c8a1791c68 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Thu, 4 Jun 2015 09:31:32 +0200 Subject: [PATCH] changes for ZT 1.0.3 relesae --- zerotier/Config.in | 4 ++-- zerotier/Makefile | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/zerotier/Config.in b/zerotier/Config.in index 48fa3cf..87da242 100644 --- a/zerotier/Config.in +++ b/zerotier/Config.in @@ -6,8 +6,8 @@ config ZEROTIER_ENABLE_DEBUG depends on PACKAGE_zerotier default n -config ZEROTIER_ENABLE_UPDATER - bool "Build with Updater" +config ZEROTIER_ENABLE_NETWORK_CONTROLLER + bool "Build with network controller" depends on PACKAGE_zerotier default n diff --git a/zerotier/Makefile b/zerotier/Makefile index 100a405..fbeb7f6 100644 --- a/zerotier/Makefile +++ b/zerotier/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.0.3-dev -PKG_REV:=99a104b9bc34acab361e4b5f3c5d7db9bda6ccb1 -PKG_RELEASE:=8 +PKG_VERSION:=1.0.3 +PKG_REV:=da592c23d477547b15a9bec2b39f476a81b28d45 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=git://github.com/mwarning/ZeroTierOne.git @@ -45,16 +45,15 @@ define Package/zerotier/config source "$(SOURCE)/Config.in" endef -ifeq ($(CONFIG_ZEROTIER_ENABLE_DEBUG),y) -MAKE_FLAGS += " ZT_DEBUG=1 " -TARGET_CFLAGS += -ggdb3 +ifeq ($(CONFIG_ZEROTIER_ENABLE_NETWORK_CONTROLLER),y) +MAKE_FLAGS += ZT_ENABLE_NETWORK_CONTROLLER=1 +DEPENDS+=+sqlite endif -ifeq ($(CONFIG_ZEROTIER_ENABLE_UPDATER),y) -MAKE_FLAGS += " ZT_AUTO_UPDATE=1 " +ifeq ($(CONFIG_ZEROTIER_ENABLE_DEBUG),y) +TARGET_CFLAGS += -DZT_TRACE -ggdb3 endif - #libstdc++ #MAKE_FLAGS += LDFLAGS="-static-libgcc -static-libstdc++ -lgcc_s" MAKE_FLAGS += \