X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=cjdns%2FMakefile;h=8efd2821dd6eddcf385255d4bd0cd1e5801df3c0;hb=1bc988c09ceb2aa0338270d5e5939d0904022e42;hp=3253532669588bc8c0144efb11e45cb83350e51b;hpb=cd765e581d0061e01d8122687685109e128f4c3e;p=feed%2Frouting.git
diff --git a/cjdns/Makefile b/cjdns/Makefile
index 3253532..8efd282 100644
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -1,12 +1,28 @@
+#
+# Copyright (C) 2014,2015 Hyperboria.net
+#
+# You may redistribute this program and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+
include $(TOPDIR)/rules.mk
PKG_NAME:=cjdns
-PKG_VERSION:=0.16
-PKG_RELEASE:=9
+PKG_VERSION:=0.17
+PKG_RELEASE:=3
-PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
+PKG_SOURCE_URL:=https://github.com/hyperboria/cjdns.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2138a1f6a94fc009958cde7b002c077a1eee929a
+PKG_SOURCE_VERSION:=40e87d9419c19063e772e39c7c59a8a8771c5ee8
PKG_LICENSE:=GPL-3.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -22,7 +38,7 @@ define Package/cjdns
TITLE:=Encrypted near-zero-conf mesh routing protocol
URL:=https://github.com/hyperboria/cjdns
MAINTAINER:=Lars Gierth
- DEPENDS:=+kmod-tun +kmod-ipv6 +libnl-tiny +libpthread +librt \
+ DEPENDS:=@IPV6 +kmod-tun +libnl-tiny +libpthread +librt \
+libuci-lua +lua-bencode +dkjson +luasocket +lua-sha2
endef
@@ -33,22 +49,46 @@ define Package/cjdns/description
of the security and scalability issues that plague existing networks.
endef
+define Package/cjdns-tests
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=cjdns test cases
+ URL:=https://github.com/hyperboria/cjdns
+ MAINTAINER:=Lars Gierth
+ DEPENDS:=+libpthread +librt
+endef
+
+define Package/cjdns-test/description
+ cjdns test cases
+endef
+
define Build/Configure
endef
+PKG_DO_VARS:=CJDNS_RELEASE_VERSION=$(PKG_SOURCE_VERSION)
+
ifneq ($(CONFIG_KERNEL_SECCOMP_FILTER),y)
-PKG_DO_VARS:=Seccomp_NO=1
+PKG_DO_VARS+= Seccomp_NO=1
+endif
+
+ifneq ($(CONFIG_USE_UCLIBC),)
+PKG_DO_VARS+= UCLIBC=1
endif
define Build/Compile
+ $(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
CROSS="true" \
CC="$(TARGET_CC)" \
+ AR="$(TARGET_AR)" \
+ RANLIB="$(TARGET_RANLIB)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
SYSTEM="linux" \
TARGET_ARCH="$(CONFIG_ARCH)" \
- UCLIBC=1 \
SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
+ GYP_ADDITIONAL_ARGS="-f make-linux" \
+ CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \
$(PKG_DO_VARS) \
$(PKG_BUILD_DIR)/do
endef
@@ -97,4 +137,12 @@ if [ -z $${IPKG_INSTROOT} ] ; then
fi
endef
+define Package/cjdns-tests/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) \
+ $(PKG_BUILD_DIR)/build_linux/test_testcjdroute_c \
+ $(1)/usr/bin
+endef
+
$(eval $(call BuildPackage,cjdns))
+$(eval $(call BuildPackage,cjdns-tests))