From 1a85f72e51cb8737378b6fb8fa842d442cc4f578 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 12 Feb 2020 21:52:05 +0100 Subject: [PATCH] jool: package missing components Jool as well as the jool-siit package depend on jool-common, which isn't currently built nur packages up. Compile and include jool-common with the jool package to fix this. The iptables component is currently also not packaged up. Fix this also. Signed-off-by: David Bauer --- net/jool/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/jool/Makefile b/net/jool/Makefile index a17bce749..6cc4dd1ca 100644 --- a/net/jool/Makefile +++ b/net/jool/Makefile @@ -40,6 +40,13 @@ define Build/Compile SUBDIRS="$(PKG_BUILD_DIR)/src/mod/siit" \ V="$(V)" \ modules + $(MAKE) -C "$(LINUX_DIR)" \ + KERNEL_DIR="$(LINUX_DIR)" \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SUBDIRS="$(PKG_BUILD_DIR)/src/mod/common" \ + V="$(V)" \ + modules $(call Build/Compile/Default) endef @@ -75,6 +82,7 @@ define KernelPackage/jool +kmod-nf-conntrack6 \ +kmod-nf-ipt FILES:= \ + $(PKG_BUILD_DIR)/src/mod/common/jool_common.$(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 @@ -110,6 +118,12 @@ define Package/jool-tools/install $(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/ + + $(INSTALL_DIR) $(1)/usr/lib/iptables + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/iptables/libxt_JOOL_SIIT.so \ + $(1)/usr/lib/iptables + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/iptables/libxt_JOOL.so \ + $(1)/usr/lib/iptables endef $(eval $(call BuildPackage,jool))