domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iptables: drop iptables-utils and ip6tables-utils, ship needed symlinks in iptables and ip6tables packages (#9691)

Browse Source 
SVN-Revision: 27961
This commit is contained in:
Jo-Philipp Wich
2011-08-11 21:26:44 +00:00
parent 82a05d1a19
commit 09bc84f55b
1 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
package/iptables/Makefile
View File

@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables PKG_NAME:=iptables
PKG_VERSION:=1.4.10 PKG_VERSION:=1.4.10
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_MD5SUM:=f382fe693f0b59d87bd47bea65eca198 PKG_MD5SUM:=f382fe693f0b59d87bd47bea65eca198
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -332,11 +332,6 @@ U32 iptables extensions.
endef endef
define Package/iptables-utils
$(call Package/iptables/Module, )
TITLE:=iptables save and restore utilities
endef
define Package/ip6tables define Package/ip6tables
$(call Package/iptables/Default) $(call Package/iptables/Default)
DEPENDS:=+kmod-ip6tables +libip6tc +libxtables DEPENDS:=+kmod-ip6tables +libip6tc +libxtables
@@ -345,13 +340,6 @@ $(call Package/iptables/Default)
MENU:=1 MENU:=1
endef endef
define Package/ip6tables-utils
$(call Package/iptables/Default)
DEPENDS:=ip6tables
CATEGORY:=IPv6
TITLE:=ip6tables save and restore utilities
endef
define Package/libiptc define Package/libiptc
$(call Package/iptables/Default) $(call Package/iptables/Default)
SECTION:=libs SECTION:=libs
@@ -438,6 +426,8 @@ endef
define Package/iptables/install define Package/iptables/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
$(LN) iptables $(1)/usr/sbin/iptables-save
$(LN) iptables $(1)/usr/sbin/iptables-restore
$(INSTALL_DIR) $(1)/usr/lib/iptables $(INSTALL_DIR) $(1)/usr/lib/iptables
(cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
for m in $(patsubst xt_%,ipt_%,$(IPT_BUILTIN)) $(patsubst ipt_%,xt_%,$(IPT_BUILTIN)); do \ for m in $(patsubst xt_%,ipt_%,$(IPT_BUILTIN)) $(patsubst ipt_%,xt_%,$(IPT_BUILTIN)); do \
@@ -448,29 +438,17 @@ define Package/iptables/install
) )
endef endef
define Package/iptables-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-multi $(1)/usr/sbin/
$(LN) iptables-multi $(1)/usr/sbin/iptables-save
$(LN) iptables-multi $(1)/usr/sbin/iptables-restore
endef
define Package/ip6tables/install define Package/ip6tables/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
$(LN) ip6tables $(1)/usr/sbin/ip6tables-save
$(LN) ip6tables $(1)/usr/sbin/ip6tables-restore
$(INSTALL_DIR) $(1)/usr/lib/iptables $(INSTALL_DIR) $(1)/usr/lib/iptables
(cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
$(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
) )
endef endef
define Package/ip6tables-utils/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-multi $(1)/usr/sbin/
$(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-save
$(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-restore
endef
define Package/libiptc/install define Package/libiptc/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/
@@ -516,7 +494,6 @@ L7_INSTALL:=\
$(eval $(call BuildPackage,iptables)) $(eval $(call BuildPackage,iptables))
$(eval $(call BuildPackage,iptables-utils))
$(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m))) $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))
$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
$(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
@@ -534,7 +511,6 @@ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
$(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m))) $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
$(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m))) $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))
$(eval $(call BuildPackage,ip6tables)) $(eval $(call BuildPackage,ip6tables))
$(eval $(call BuildPackage,ip6tables-utils))
$(eval $(call BuildPackage,libiptc)) $(eval $(call BuildPackage,libiptc))
$(eval $(call BuildPackage,libip4tc)) $(eval $(call BuildPackage,libip4tc))
$(eval $(call BuildPackage,libip6tc)) $(eval $(call BuildPackage,libip6tc))