fix essid setting in adhoc mode

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 962ca7d..1bd13a5 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -19,15 +19,12 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
        ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5

-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 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)

 endif
 
 define Package/iptables/Default
 endif
 
 define Package/iptables/Default


@@ -74,7 +71,7 @@ endef
 
 define Package/iptables-mod-imq
   $(call Package/iptables/Default)
 
 define Package/iptables-mod-imq
   $(call Package/iptables/Default)

-  DEPENDS:=iptables
+  DEPENDS:=iptables +kmod-ipt-imq

   TITLE:=IMQ support
   DESCRIPTION:=\
        iptables extension for IMQ support.\\\
   TITLE:=IMQ support
   DESCRIPTION:=\
        iptables extension for IMQ support.\\\


@@ -91,6 +88,7 @@ define Package/iptables-mod-ipopt
        iptables extensions for matching/changing IP packet options.\\\
        \\\
        Includes: \\\
        iptables extensions for matching/changing IP packet options.\\\
        \\\
        Includes: \\\

+       - libipt_CLASSIFY \\\

        - libipt_dscp/DSCP \\\
        - libipt_ecn/ECN \\\
        - libipt_length \\\
        - libipt_dscp/DSCP \\\
        - libipt_ecn/ECN \\\
        - libipt_length \\\


@@ -147,7 +145,8 @@ define Package/iptables-mod-extra
        - libipt_owner \\\
        - libipt_physdev \\\
        - libipt_pkttype \\\
        - libipt_owner \\\
        - libipt_physdev \\\
        - libipt_pkttype \\\

-       - libipt_recent
+       - libipt_recent \\\
+       - libipt_NOTRACK

 endef
 
 define Package/iptables-utils
 endef
 
 define Package/iptables-utils


@@ -163,6 +162,9 @@ define Package/ip6tables
 endef
 
 define Build/Configure
 endef
 
 define Build/Configure

+       rm -f $(PKG_BUILD_DIR)/.configured*
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               clean

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -171,6 +173,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \

+               LDFLAGS="-rdynamic -static-libgcc" \

                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install


@@ -188,6 +191,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

+       rm -rf $(STAGING_DIR)/usr/include/libipq.h

        rm -rf $(STAGING_DIR)/usr/include/libipulog
        rm -rf $(STAGING_DIR)/usr/include/libipq
        rm -rf $(STAGING_DIR)/usr/include/libiptc
        rm -rf $(STAGING_DIR)/usr/include/libipulog
        rm -rf $(STAGING_DIR)/usr/include/libipq
        rm -rf $(STAGING_DIR)/usr/include/libiptc


@@ -240,7 +244,8 @@ define BuildPlugin
   $$(eval $$(call BuildPackage,$(1)))
 endef
 
   $$(eval $$(call BuildPackage,$(1)))
 endef
 

-L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+L7_INSTALL:=\
+       $(INSTALL_DIR) $$(1)/etc/l7-protocols; \

        $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
 $(eval $(call BuildPackage,iptables))
        $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
 $(eval $(call BuildPackage,iptables))