aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-06-06 14:02:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-06-06 14:02:29 +0000
commit5cf06bd17b05b51e7ccad4c669878f3f22328b3b (patch)
tree4bf0c679e5dd32608212d01e168e67b1464cb002
parente94cf1c72bde8b724fd03b1fe1d7d474fa0605cd (diff)
downloadupstream-5cf06bd17b05b51e7ccad4c669878f3f22328b3b.tar.gz
upstream-5cf06bd17b05b51e7ccad4c669878f3f22328b3b.tar.bz2
upstream-5cf06bd17b05b51e7ccad4c669878f3f22328b3b.zip
firewall: copy libext*.a from staging dir and drop kernel.mk includes, solves problem with colliding CONFIG_IPV6 symbols
SVN-Revision: 36868
-rw-r--r--package/network/config/firewall/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile
index a54ffc1359..9c05e34bed 100644
--- a/package/network/config/firewall/Makefile
+++ b/package/network/config/firewall/Makefile
@@ -20,7 +20,6 @@ PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/firewall
@@ -40,9 +39,7 @@ define Package/firewall/conffiles
endef
define Build/Configure
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext.a)
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext4.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext4.a)
- $(foreach file,$(lastword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/extensions/libext6.a)),$(CP) $(file) $(PKG_BUILD_DIR)/libext6.a)
+ $(foreach file,$(wildcard $(STAGING_DIR)/usr/lib/iptables/libext*.a),$(CP) $(file) $(PKG_BUILD_DIR)/$(notdir $(file));)
$(call Build/Configure/Default)
endef