fix libnl include issues which broke a few packages

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index bd0ecda..f764248 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.8
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.8

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \


@@ -97,8 +97,10 @@ define Package/iptables-mod-ipopt/description
  - libipt_ecn/ECN
  - libipt_length
  - libipt_mac
  - libipt_ecn/ECN
  - libipt_length
  - libipt_mac

- - libipt_tos/TOS
+ - libipt_mark/MARK
+ - libipt_statistic

  - libipt_tcpmms
  - libipt_tcpmms

+ - libipt_tos/TOS

  - libipt_ttl/TTL
  - libipt_unclean 
 endef
  - libipt_ttl/TTL
  - libipt_unclean 
 endef


@@ -114,6 +116,7 @@ define Package/iptables-mod-ipsec/description
  Includes: 
  - libipt_ah
  - libipt_esp
  Includes: 
  - libipt_ah
  - libipt_esp

+ - libipt_policy

 endef
 
 define Package/iptables-mod-nat
 endef
 
 define Package/iptables-mod-nat


@@ -166,7 +169,11 @@ define Package/iptables-mod-extra/description
  - libipt_physdev
  - libipt_pkttype
  - libipt_recent
  - libipt_physdev
  - libipt_pkttype
  - libipt_recent

+ - iptable_raw

  - libipt_NOTRACK
  - libipt_NOTRACK

+ - libipt_TARPIT
+ - libipt_DELUDE
+ - libipt_CHAOS

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


@@ -195,6 +202,11 @@ define Package/ip6tables-utils
  TITLE:=ip6tables save and restore utilities
 endef
 
  TITLE:=ip6tables save and restore utilities
 endef
 

+define Build/Prepare
+       $(call Build/Prepare/Default)
+       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
+endef
+

 define Build/Configure
        rm -f $(PKG_BUILD_DIR)/.configured*
        $(MAKE) -C $(PKG_BUILD_DIR) \
 define Build/Configure
        rm -f $(PKG_BUILD_DIR)/.configured*
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -202,7 +214,6 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \


@@ -218,22 +229,22 @@ define Build/InstallDev
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \

-               DESTDIR="$(STAGING_DIR)" \
+               DESTDIR="$(1)" \

                install-devel
                install-devel

-       $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr
-       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr
+       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib

 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/linux/netfilter*
-       rm -rf $(STAGING_DIR)/usr/include/iptables*
-       rm -rf $(STAGING_DIR)/usr/include/ip6tables*
-       rm -rf $(STAGING_DIR)/usr/lib/libipq.a
-       rm -rf $(STAGING_DIR)/usr/lib/libiptc.a
+       rm -rf $(1)/usr/include/libipq.h
+       rm -rf $(1)/usr/include/libipulog
+       rm -rf $(1)/usr/include/libipq
+       rm -rf $(1)/usr/include/libiptc
+       rm -rf $(1)/usr/include/linux/netfilter*
+       rm -rf $(1)/usr/include/iptables*
+       rm -rf $(1)/usr/include/ip6tables*
+       rm -rf $(1)/usr/lib/libipq.a
+       rm -rf $(1)/usr/lib/libiptc.a

 endef
 
 define Package/iptables/install
 endef
 
 define Package/iptables/install