diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-01 23:52:52 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-12 19:26:52 +0200 |
| commit | 56993a53805dafa1dbd3a11d450c3a5c8ae39e6c (patch) | |
| tree | b9a6a798b57afb5882543f86f0d0cb5f6c309cde | |
| parent | 0d5cf75df62825209e134841f0e82f205a0a8c87 (diff) | |
iptables: convert old-style hook to new-style hook
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/iptables/iptables.mk | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 0b7dae181..21146bce6 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -16,24 +16,34 @@ endif IPTABLES_AUTORECONF = YES IPTABLES_LIBTOOL_PATCH = NO -$(eval $(call AUTOTARGETS,package,iptables)) - -$(IPTABLES_HOOK_POST_INSTALL): $(IPTABLES_TARGET_INSTALL_TARGET) +define IPTABLES_TARGET_SYMLINK_CREATE ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-save ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-restore -ifeq ($(BR2_INET_IPV6),y) +endef + +define IPTABLES_TARGET_IPV6_SYMLINK_CREATE ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore -else +endef + +define IPTABLES_TARGET_IPV6_REMOVE rm -f $(TARGET_DIR)/usr/lib/libip6tc.* +endef + +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_SYMLINK_CREATE + +ifeq ($(BR2_INET_IPV6),y) +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_SYMLINK_CREATE +else +IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_REMOVE endif - touch $@ -$(IPTABLES_TARGET_UNINSTALL): - $(call MESSAGE,"Uninstalling") +define IPTABLES_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/bin/iptables-xml rm -f $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/ip6tables* rm -rf $(TARGET_DIR)/usr/lib/xtables - rm -f $(IPTABLES_TARGET_INSTALL_TARGET) $(IPTABLES_HOOK_POST_INSTALL) +endef + +$(eval $(call AUTOTARGETS,package,iptables)) |