cjdns: use codeload

Simplifies Makefile slightly. Hopefully more consistent tarballs.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/cjdns/Makefile b/cjdns/Makefile
index ae5fdb34d72f18b8d51e2ab83c1c62c27bfef2bb..23e655ea0dbdec37b9fd3cb0d42a00cf6e647243 100644 (file)
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -20,10 +20,10 @@ PKG_NAME:=cjdns
 PKG_VERSION:=v21
 PKG_RELEASE:=1
 
-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)-$(PKG_VERSION)?
+PKG_HASH:=6dfb1fe18c9689324f36c8d33e660972aac5af4579fcaa9c4730179bc8d67c69
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=William Fleurant <meshnet@protonmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -75,8 +75,8 @@ 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)" \
        AR="$(TARGET_AR)" \
@@ -87,7 +87,7 @@ define Build/Compile
        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
@@ -106,11 +106,11 @@ define Package/cjdns/install
                $(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) \
@@ -138,7 +138,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