From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 6 Jun 2013 14:02:29 +0000 (+0000)
Subject: firewall: copy libext*.a from staging dir and drop kernel.mk includes, solves problem... 
X-Git-Tag: reboot~10270
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5cf06bd17b05b51e7ccad4c669878f3f22328b3b;p=openwrt%2Fopenwrt.git

firewall: copy libext*.a from staging dir and drop kernel.mk includes, solves problem with colliding CONFIG_IPV6 symbols

SVN-Revision: 36868
---

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