add 2.6.32 patches to use ext4 for ext2/3

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 7c849cb..2647f68 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -21,12 +21,13 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1

+PKG_BUILD_PARALLEL:=1

 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   -include $(LINUX_DIR)/.config
   include $(INCLUDE_DIR)/netfilter.mk
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   -include $(LINUX_DIR)/.config
   include $(INCLUDE_DIR)/netfilter.mk

-  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)

 endif
 
 
 endif
 
 


@@ -304,9 +305,9 @@ MAKE_FLAGS := \
        KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
        KBUILD_OUTPUT="$(LINUX_DIR)" \
 
        KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
        KBUILD_OUTPUT="$(LINUX_DIR)" \
 

-define Build/Prepare
-$(call Build/Prepare/Default)
+define Build/Configure

        (cd $(PKG_BUILD_DIR); ./autogen.sh)
        (cd $(PKG_BUILD_DIR); ./autogen.sh)

+$(call Build/Configure/Default)

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -353,6 +354,10 @@ endef
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/

+       $(INSTALL_DIR) $(1)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+               $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
+       )

 endef
 
 define Package/ip6tables-utils/install
 endef
 
 define Package/ip6tables-utils/install