Make ipkg depends on tar and gunzip (#2821)

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index cee5c60..80646cd 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -97,8 +97,10 @@ define Package/iptables-mod-ipopt/description
  - libipt_ecn/ECN
  - libipt_length
  - libipt_mac
  - libipt_ecn/ECN
  - libipt_length
  - libipt_mac

- - libipt_tos/TOS
+ - libipt_mark/MARK
+ - libipt_statistic

  - libipt_tcpmms
  - libipt_tcpmms

+ - libipt_tos/TOS

  - libipt_ttl/TTL
  - libipt_unclean 
 endef
  - libipt_ttl/TTL
  - libipt_unclean 
 endef


@@ -114,6 +116,7 @@ define Package/iptables-mod-ipsec/description
  Includes: 
  - libipt_ah
  - libipt_esp
  Includes: 
  - libipt_ah
  - libipt_esp

+ - libipt_policy

 endef
 
 define Package/iptables-mod-nat
 endef
 
 define Package/iptables-mod-nat


@@ -253,7 +256,7 @@ define Package/iptables/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \


@@ -262,12 +265,12 @@ endef
 
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/

 endef
 
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin
 endef
 
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/

        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \


@@ -276,7 +279,7 @@ endef
 
 define Package/ip6tables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/ip6tables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/

 endef
 
 define BuildPlugin
 endef
 
 define BuildPlugin