babeld: use an array for routing lists

[feed/routing.git] / cjdns / Makefile

diff --git a/cjdns/Makefile b/cjdns/Makefile
index ae5fdb34d72f18b8d51e2ab83c1c62c27bfef2bb..cd3ccfeb4b13cc0a502ab4dc09be73893d8297d5 100644 (file)
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -17,13 +17,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
-PKG_VERSION:=v21
-PKG_RELEASE:=1
+PKG_VERSION:=21.1
+PKG_RELEASE:=6
 
-PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/cjdelisle/cjdns.git
-PKG_MIRROR_HASH:=ee22f5a94b56ac75ff8e3bc7bfaa70c45985c3dcf2a260c03e7754f4102da46a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-v$(PKG_VERSION)?
+PKG_HASH:=a6158ce7847159aa44e86f74ccc7b6ded6910a230ed8f3830db53cda5838f0b0
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-v$(PKG_VERSION)
 
 PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -75,19 +75,19 @@ PKG_DO_VARS+= UCLIBC=1
 endif
 
 define Build/Compile
-       $(INSTALL_DIR) $(BUILD_DIR)/$(PKG_SOURCE_VERSION)/tmp
-       (cd $(BUILD_DIR)/$(PKG_SOURCE_VERSION) && \
+       $(INSTALL_DIR) $(PKG_BUILD_DIR)/tmp
+       (cd $(PKG_BUILD_DIR) && \
        CROSS="true" \
-       CC="$(TARGET_CC)" \
+       CC="$(TARGET_CC_NOCACHE)" \
        AR="$(TARGET_AR)" \
        RANLIB="$(TARGET_RANLIB)" \
-       CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE" \
+       CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -Wno-error=array-bounds -Wno-error=stringop-overflow -Wno-error=stringop-overread" \
        LDFLAGS="$(TARGET_LDFLAGS)" \
        SYSTEM="linux" \
        TARGET_ARCH="$(CONFIG_ARCH)" \
        SSP_SUPPORT="$(CONFIG_SSP_SUPPORT)" \
        GYP_ADDITIONAL_ARGS="-f make-linux" \
-       CJDNS_BUILD_TMPDIR="$(BUILD_DIR)/$(PKG_SOURCE_VERSION)/tmp" \
+       CJDNS_BUILD_TMPDIR="$(PKG_BUILD_DIR)/tmp" \
        $(PKG_DO_VARS) \
        exec ./do)
 endef
@@ -99,18 +99,19 @@ define Package/cjdns/install
                $(1)/etc/config \
                $(1)/etc/init.d \
                $(1)/etc/uci-defaults \
-               $(1)/usr/lib/lua/cjdns
+               $(1)/usr/lib/lua/cjdns \
+               $(1)/usr/share/ucitrack
 
        $(INSTALL_BIN) \
                ./files/cjdrouteconf \
                $(1)/usr/bin
 
        $(INSTALL_BIN) \
-               $(BUILD_DIR)/$(PKG_SOURCE_VERSION)/cjdroute \
+               $(PKG_BUILD_DIR)/cjdroute \
                $(1)/usr/sbin
 
        $(INSTALL_BIN) \
-               $(BUILD_DIR)/$(PKG_SOURCE_VERSION)/publictoip6 \
+               $(PKG_BUILD_DIR)/publictoip6 \
                $(1)/usr/bin
 
        $(INSTALL_BIN) \
@@ -121,6 +122,10 @@ define Package/cjdns/install
                ./files/cjdns.defaults \
                $(1)/etc/uci-defaults/cjdns
 
+       $(INSTALL_DATA) \
+               ./files/luci-app-cjdns.json \
+               $(1)/usr/share/ucitrack
+
        $(CP) \
                ./lua/cjdns/* \
                $(1)/usr/lib/lua/cjdns
@@ -138,7 +143,7 @@ endef
 define Package/cjdns-tests/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) \
-               $(BUILD_DIR)/$(PKG_SOURCE_VERSION)/build_linux/test_testcjdroute_c \
+               $(PKG_BUILD_DIR)/build_linux/test_testcjdroute_c \
                $(1)/usr/bin
 endef