diff options
author | Rosen Penev <rosenp@gmail.com> | 2019-09-24 17:23:44 -0700 |
---|---|---|
committer | Rosen Penev <rosenp@gmail.com> | 2019-10-01 18:40:39 -0700 |
commit | cae9da4d264d85a13b4835e55e74dc97102b04c2 (patch) | |
tree | 82c41ff4392163eeeaa64ac57f3780b5666d42e2 /net/jool/Makefile | |
parent | 4f717a6f65b5c495aec770b507913befa40b8997 (diff) |
jool: Update to 4.0.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/jool/Makefile')
-rw-r--r-- | net/jool/Makefile | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/net/jool/Makefile b/net/jool/Makefile index 0e0ea11ab..17cd56bc3 100644 --- a/net/jool/Makefile +++ b/net/jool/Makefile @@ -8,40 +8,36 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=jool -PKG_VERSION:=3.5.7 -PKG_RELEASE:=2 +PKG_VERSION:=4.0.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/NICMx/Jool/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b8e95d1526cd2434dedbae292afd2d17f0780ac2dca2be21264712b41eb76a3d -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/Jool-$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/NICMx/Jool/releases/download/v$(PKG_VERSION) +PKG_HASH:=b61ae37d7a71e28530765bdfd9a62f89e7878e3ea9c15dabbcefcd144891100d -PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:= +PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING +PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone - -PKG_FIXUP:=autoreconf +PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone include $(INCLUDE_DIR)/package.mk -MAKE_PATH:=usr -CONFIGURE_PATH:=usr - define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ KERNEL_DIR="$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - SUBDIRS="$(PKG_BUILD_DIR)/mod/stateful" \ + SUBDIRS="$(PKG_BUILD_DIR)/src/mod/nat64" \ V="$(V)" \ modules $(MAKE) -C "$(LINUX_DIR)" \ KERNEL_DIR="$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - SUBDIRS="$(PKG_BUILD_DIR)/mod/stateless" \ + SUBDIRS="$(PKG_BUILD_DIR)/src/mod/siit" \ V="$(V)" \ modules $(call Build/Compile/Default) @@ -76,10 +72,11 @@ define KernelPackage/jool @IPV6 \ +kmod-crypto-md5 \ +kmod-nf-conntrack \ - +kmod-nf-conntrack6 + +kmod-nf-conntrack6 \ + +kmod-nf-ipt FILES:= \ - $(PKG_BUILD_DIR)/mod/stateful/jool.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/mod/stateless/jool_siit.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/src/mod/nat64/jool.$(LINUX_KMOD_SUFFIX) \ + $(PKG_BUILD_DIR)/src/mod/siit/jool_siit.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/jool/description @@ -91,7 +88,7 @@ endef define Package/jool-tools $(call Package/jool/Default) TITLE:=Jool userspace control programs - DEPENDS:=+libnl +ethtool + DEPENDS:=+libnl +libxtables +ethtool endef define Package/jool-tools/description @@ -100,10 +97,19 @@ define Package/jool-tools/description This package provides the userspace control programs for Jool. endef +CONFIGURE_ARGS += \ + --disable-shared \ + --without-bash-completion-dir + +CONFIGURE_VARS += \ + ac_cv_func_memset=yes \ + ac_cv_func_strcasecmp=yes + define Package/jool-tools/install - $(INSTALL_DIR) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/stateful/jool $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/stateless/jool_siit $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jool $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/joold $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jool_siit $(1)/usr/bin/ endef $(eval $(call BuildPackage,jool)) |