Convert iptables to new packaging style

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@922 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index 2f12dbd..29dcf6c 100644 (file)
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -3,136 +3,79 @@
 include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 
 include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 

-PKG_NAME := iptables
-PKG_VERSION := 1.3.1
-PKG_RELEASE := 1
-PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b
+PKG_NAME:=iptables
+PKG_VERSION:=1.3.1
+PKG_RELEASE:=1
+PKG_MD5SUM:=c3358a3bd0d7755df0b64a5063db296b

 
 

-PKG_SOURCE_SITE := http://www.netfilter.org/files
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_CAT := bzcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.netfilter.org/files
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat

 
 

-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

-PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPT_UTILS := $(PACKAGE_DIR)/iptables-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+include $(TOPDIR)/package/rules.mk

 
 

-I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables
-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
+$(eval $(call PKG_template,IPTABLES,iptables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,IPTABLES_EXTRA,iptables-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT)
-ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),)
-TARGETS += $(PKG_IPT_UTILS)
-endif
-ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),)
-TARGETS += $(PKG_IPT_EXTRA)
-endif
-ifneq ($(BR2_PACKAGE_IP6TABLES),)
-TARGETS += $(PKG_IP6T)
-endif
-
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
-ifeq ($(BR2_PACKAGE_IPTABLES_UTILS),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-utils.list
-endif
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
-endif
-ifeq ($(BR2_PACKAGE_IP6TABLES),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
-endif
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
-       mkdir -p $(PKG_BUILD_DIR)/modules
-       $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched
-       $(TARGET_CONFIGURE_OPTS) \
+$(PKG_BUILD_DIR)/.built:
+       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test
+       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

+               $(TARGET_CONFIGURE_OPTS) \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \

                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \

-               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install install-devel
+       touch $(PKG_BUILD_DIR)/.built

                
                

-$(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/
-       cp $(PKG_BUILD_DIR)/libiptc/libiptc.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) 
-       mkdir -p $(I_IPT)/usr/sbin
-       cp -af $(PKG_BUILD_DIR)/iptables $(I_IPT)/usr/sbin/
-       $(STRIP) $(I_IPT)/usr/sbin/iptables
-       mkdir -p $(I_IPT)/usr/lib/iptables
-       (cd $(PKG_BUILD_DIR)/extensions; \
-        cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables)
-       -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
-       $(IPKG) install $(PKG_IPT)
-
-$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
-       mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
-       (cd $(PKG_BUILD_DIR)/extensions; \
-        cp $(patsubst %,libipt_%.so,$(ext-m)) $(I_IPT_EXTRA)/usr/lib/iptables)
-       -$(STRIP) $(I_IPT_EXTRA)/usr/lib/iptables/*.so
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
-       $(IPKG) install $(PKG_IPT_EXTRA)
-
-$(PKG_IPT_UTILS): $(PKG_BUILD_DIR)/iptables
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_UTILS) control/iptables-utils.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
-       mkdir -p $(I_IPT_UTILS)/usr/sbin
-       cp $(PKG_BUILD_DIR)/iptables-save $(I_IPT_UTILS)/usr/sbin
-       cp $(PKG_BUILD_DIR)/iptables-restore $(I_IPT_UTILS)/usr/sbin
-       -$(STRIP) $(I_IPT_UTILS)/usr/sbin/*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(I_IPT_UTILS) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables-utils.list: $(PKG_IPT)
-       $(IPKG) install $(PKG_IPT_UTILS)
-
-$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
-       mkdir -p $(I_IP6T)/usr/sbin
-       cp -af $(PKG_BUILD_DIR)/ip6tables $(I_IP6T)/usr/sbin/
-       $(STRIP) $(I_IP6T)/usr/sbin/ip6tables
-       mkdir -p $(I_IP6T)/usr/lib/iptables
-       (cd $(PKG_BUILD_DIR)/extensions; \
-        cp libip6t_*.so $(I_IP6T)/usr/lib/iptables)
-       -$(STRIP) $(I_IP6T)/usr/lib/iptables/*.so
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
-       $(IPKG) install $(PKG_IP6T)
-
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(TARGETS)
-install: $(INSTALL_TARGETS)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T)
+$(IPKG_IPTABLES):
+       install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
+       install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+        cp -fpR $(patsubst %,libipt_%.so,$(ext-y)) $(IDIR_IPTABLES)/usr/lib/iptables \
+       )
+       $(RSTRIP) $(IDIR_IPTABLES)
+       $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)
+
+$(IPKG_IPTABLES_EXTRA):
+       install -d -m0755 $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+        cp -fpR $(patsubst %,libipt_%.so,$(ext-m)) $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables \
+       )
+       $(RSTRIP) $(IDIR_IPTABLES_EXTRA)
+       $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(PACKAGE_DIR)
+
+$(IPKG_IPTABLES_UTILS):
+       install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin
+       $(RSTRIP) $(IDIR_IPTABLES_UTILS)
+       $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR)
+
+$(IPKG_IP6TABLES):
+       install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/
+       install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+        cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables \
+       )
+       $(RSTRIP) $(IDIR_IP6TABLES)
+       $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
+
+install-dev: $(STAGING_DIR)/usr/lib/libipq.a
+
+uninstall-dev:
+       rm -rf $(STAGING_DIR)/usr/include/libipq.h
+       rm -rf $(STAGING_DIR)/usr/lib/libipq.a
+
+compile: install-dev
+clean: uninstall-dev

diff --git a/openwrt/package/iptables/control/ip6tables.control b/openwrt/package/iptables/control/ip6tables.control
deleted file mode 100644 (file)
index dcfe37d..0000000
--- a/openwrt/package/iptables/control/ip6tables.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: ip6tables
-Priority: optional
-Depends: kmod-ip6tables
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: The netfilter firewalling software for IPv6

diff --git a/openwrt/package/iptables/control/iptables-extra.control b/openwrt/package/iptables/control/iptables-extra.control
deleted file mode 100644 (file)
index a8a4103..0000000
--- a/openwrt/package/iptables/control/iptables-extra.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: iptables-extra
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Extra plugins for iptables
-Depends: kmod-iptables-extra

diff --git a/openwrt/package/iptables/control/iptables-utils.control b/openwrt/package/iptables/control/iptables-utils.control
deleted file mode 100644 (file)
index 2dbc80e..0000000
--- a/openwrt/package/iptables/control/iptables-utils.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: iptables-utils
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: iptables-save and iptables-restore

diff --git a/openwrt/package/iptables/control/iptables.control b/openwrt/package/iptables/control/iptables.control
deleted file mode 100644 (file)
index 7a084a7..0000000
--- a/openwrt/package/iptables/control/iptables.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: iptables
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: The netfilter firewalling software for IPv4

diff --git a/openwrt/package/iptables/ipkg/ip6tables.control b/openwrt/package/iptables/ipkg/ip6tables.control
new file mode 100644 (file)
index 0000000..dcfe37d
--- /dev/null
+++ b/openwrt/package/iptables/ipkg/ip6tables.control
@@ -0,0 +1,7 @@
+Package: ip6tables
+Priority: optional
+Depends: kmod-ip6tables
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: The netfilter firewalling software for IPv6

diff --git a/openwrt/package/iptables/ipkg/iptables-extra.control b/openwrt/package/iptables/ipkg/iptables-extra.control
new file mode 100644 (file)
index 0000000..a8a4103
--- /dev/null
+++ b/openwrt/package/iptables/ipkg/iptables-extra.control
@@ -0,0 +1,7 @@
+Package: iptables-extra
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Extra plugins for iptables
+Depends: kmod-iptables-extra

diff --git a/openwrt/package/iptables/ipkg/iptables-utils.control b/openwrt/package/iptables/ipkg/iptables-utils.control
new file mode 100644 (file)
index 0000000..2dbc80e
--- /dev/null
+++ b/openwrt/package/iptables/ipkg/iptables-utils.control
@@ -0,0 +1,6 @@
+Package: iptables-utils
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: iptables-save and iptables-restore

diff --git a/openwrt/package/iptables/ipkg/iptables.control b/openwrt/package/iptables/ipkg/iptables.control
new file mode 100644 (file)
index 0000000..7a084a7
--- /dev/null
+++ b/openwrt/package/iptables/ipkg/iptables.control
@@ -0,0 +1,6 @@
+Package: iptables
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: The netfilter firewalling software for IPv4