[rdc] 2.6.27 also needs to hack the command line passed to the kernel

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index dfe7cac..6083f6f 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -20,7 +19,7 @@ endif
 
 ifeq ($(CONFIG_LINUX_2_6),y)
   PKG_VERSION:=1.4.1.1
 
 ifeq ($(CONFIG_LINUX_2_6),y)
   PKG_VERSION:=1.4.1.1

-  PKG_RELEASE:=1
+  PKG_RELEASE:=2

   PKG_MD5SUM:=723fa88d8a0915e184f99e03e9bf06cb
 endif
 
   PKG_MD5SUM:=723fa88d8a0915e184f99e03e9bf06cb
 endif
 


@@ -102,7 +101,7 @@ endef
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:

- - libipt_ipp2p
+ - libipt_string

  - libipt_layer7
 endef
 
  - libipt_layer7
 endef
 


@@ -211,9 +210,6 @@ define Package/iptables-mod-extra/description
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK

- - libipt_TARPIT
- - libipt_DELUDE
- - libipt_CHAOS

 endef
 
 define Package/iptables-mod-ipset
 endef
 
 define Package/iptables-mod-ipset


@@ -254,8 +250,12 @@ ifeq ($(KERNEL),2.4)
   endef
 endif
 
   endef
 endif
 

+TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS)

 TARGET_CFLAGS += $(FPIC)
 TARGET_CFLAGS += $(FPIC)

-CONFIGURE_ARGS += --enable-devel --with-xtlibdir=/usr/lib/iptables 
+CONFIGURE_ARGS += \
+       --enable-devel \
+       --with-kernel="$(LINUX_DIR)" \
+       --with-xtlibdir=/usr/lib/iptables

 
 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
 
 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)