summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-01 20:43:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-01 20:43:11 +0000
commit43a119e79dafcb2eba0d2df6c51d562514576316 (patch)
treea380c39ab73e0a7696b2b509d8ce8210fe4ea086
parent4ba87da37c3d3037ae4dc2f35298d6d9f7b9a0f7 (diff)
update iptables to 1.3.1 and build/copy libipq.a+includes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@510 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/iptables/Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index d9c0c585d..401835379 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include kernelconfig.mk
PKG_NAME := iptables
-PKG_VERSION := 1.3.0
+PKG_VERSION := 1.3.1
PKG_RELEASE := 1
-PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033
+PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b
PKG_SOURCE_SITE := http://www.netfilter.org/files
PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -25,7 +25,7 @@ I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils
I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra
I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables
-TARGETS := $(PKG_IPT)
+TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT)
ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),)
TARGETS += $(PKG_IPT_UTILS)
endif
@@ -62,6 +62,15 @@ $(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched
$(MAKE) -C $(PKG_BUILD_DIR) \
KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
+
+$(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables
+ $(TARGET_CONFIGURE_OPTS) \
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+ CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
+ libipq/libipq.a
+ cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/
+ cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/
$(PKG_IPT): $(PKG_BUILD_DIR)/iptables
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)