Changeset d419478 in freewrt for package/iptables

Timestamp:

Jul 21, 2006, 1:56:32 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

50d34d3

Parents:

2029b2e

Message:

• whitespace cleanup, while here
• move WRKDIR and DISTFILES definition into PKG_template
• define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
• use a sub-directory as WRKDIR, like BSD
• rename PKG_BUILD_DIR into WRKBUILD
• define WRKBUILD relative via WRKDIR
• rename PKG_INSTALL_DIR into WRKINST
• fix a few dependencies
• make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
• use WRKDIR instead of BUILD_DIR in places where the latter was used previously
• while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/iptables/Makefile (modified) (7 diffs)

package/iptables/Makefile

@@ -13 +13 @@
         ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 define IPKG_plugin_template
@@ -23 +20 @@
         install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables
         for m in $$(patsubst xt_%,ipt_%,$(2)); do \
-                $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \
+                $(CP) $(WRKINST)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \
         done
         @[ -z "$(3)" ] || $(MAKE) $(3)
@@ -58 +55 @@
 $(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPT_ULOG-m)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        chmod a+x $(WRKBUILD)/extensions/.*-test*
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
                 KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+                DESTDIR="$(WRKINST)" \
                 all install install-devel
         touch $@
@@ -76 +73 @@
         install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall
         install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
         install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
-        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+        (cd $(WRKINST)/usr/lib/iptables ; \
                 $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
         )
@@ -89 +86 @@
 $(IPKG_IPTABLES_UTILS):
         install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/
         $(RSTRIP) $(IDIR_IPTABLES_UTILS)
         $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR)
@@ -95 +92 @@
 $(IPKG_IP6TABLES):
         install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/
         install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables
-        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+        (cd $(WRKINST)/usr/lib/iptables ; \
                 $(CP) libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \
         )
@@ -103 +100 @@
         $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(STAGING_DIR)/usr/lib/libipq.a: $(WRKBUILD)/.built
+        $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \