aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-18 13:21:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-18 13:21:32 +0000
commit3c8827fa7f72af0b88db529f2a71fc42b00d8cab (patch)
tree0c98bc5a5c30c4846fe998b04853e844a31a8073
parentaec0e6ac8fc2cf42e90a0005d9ae6ef1148bf6bc (diff)
downloadupstream-3c8827fa7f72af0b88db529f2a71fc42b00d8cab.tar.gz
upstream-3c8827fa7f72af0b88db529f2a71fc42b00d8cab.tar.bz2
upstream-3c8827fa7f72af0b88db529f2a71fc42b00d8cab.zip
iptables: fix rebuild errors on configuration changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48314
-rw-r--r--package/network/utils/iptables/Makefile14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index 626b252761..e5bca40c7e 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -448,6 +448,20 @@ MAKE_FLAGS := \
KBUILD_OUTPUT="$(LINUX_DIR)" \
BUILTIN_MODULES="$(patsubst ip6t_%,%,$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m))))"
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+ define Build/Configure/rebuild
+ $(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.\?o -or -name \*.a | $(XARGS) rm -f
+ rm -f $(PKG_BUILD_DIR)/.config_*
+ rm -f $(PKG_BUILD_DIR)/.configured_*
+ touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+ endef
+endif
+
+define Build/Configure
+$(Build/Configure/rebuild)
+$(Build/Configure/Default)
+endef
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/include/iptables