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 <redacted>

diff --git a/net/jool/Makefile b/net/jool/Makefile
index a17bce7493078e7857f7b1c014dc79804b5d6e62..6cc4dd1caf238f6f91b76d7a9279b2b4e9314e65 100644 (file)
--- 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))