Date:2010-08-10 19:12:49 (2 years 10 months ago)
Author:nico
Commit:0586ca82824f4c00e07387c2060023415318d343
Message:package/iptables: update to 1.4.9.1 and cleanup:

* call autogen.sh in Build/Prepare instead of Build/Compile
* use PKG_INSTALL
* re-enable static libs
* add dep on libiptc & libxtables to ip6tables


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22582 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: package/iptables/Makefile (6 diffs)

Change Details

package/iptables/Makefile
99include $(INCLUDE_DIR)/kernel.mk
1010
1111PKG_NAME:=iptables
12PKG_VERSION:=1.4.9
12PKG_VERSION:=1.4.9.1
1313PKG_RELEASE:=1
1414
15PKG_MD5SUM:=db1312f7ce5a4c11dc981a2ac76b26e8
15PKG_MD5SUM:=fbadfb0b5f2dbda49e0ad06a798898e3
1616PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
1717PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
1818    ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
...... 
2020    ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
2121
2222PKG_FIXUP:=libtool
23PKG_INSTALL:=1
2324
2425include $(INCLUDE_DIR)/package.mk
2526ifeq ($(DUMP),)
...... 
245246
246247define Package/ip6tables
247248$(call Package/iptables/Default)
248  DEPENDS:=+kmod-ip6tables
249  DEPENDS:=+kmod-ip6tables +libiptc +libxtables
249250  CATEGORY:=IPv6
250251  TITLE:=IPv6 firewall administration tool
251252  MENU:=1
...... 
292293    --enable-shared \
293294    --enable-devel \
294295    --enable-ipv6 \
296    --enable-libipq \
295297    --with-kernel="$(LINUX_DIR)" \
296298    --with-xtlibdir=/usr/lib/iptables
297299
298IPTABLES_MAKEOPTS = \
299        $(TARGET_CONFIGURE_OPTS) \
300        COPT_FLAGS="$(TARGET_CFLAGS)" \
301        LDFLAGS="-rdynamic -static-libgcc" \
302        KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
303        KBUILD_OUTPUT="$(LINUX_DIR)" \
304        DESTDIR="$(PKG_INSTALL_DIR)" \
305        $(MAKE_TARGETS)
306
307define Build/Compile
308    $(INSTALL_DIR) $(PKG_INSTALL_DIR)
300MAKE_FLAGS := \
301    $(TARGET_CONFIGURE_OPTS) \
302    COPT_FLAGS="$(TARGET_CFLAGS)" \
303    LDFLAGS="-rdynamic -static-libgcc" \
304    KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
305    KBUILD_OUTPUT="$(LINUX_DIR)" \
306
307define Build/Prepare
308$(call Build/Prepare/Default)
309309    (cd $(PKG_BUILD_DIR); ./autogen.sh)
310    $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS)
311    $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) install
312    $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS)
313    $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) install
314310endef
315311
316312define Build/InstallDev
...... 
328324
329325    $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
330326    $(INSTALL_DIR) $(1)/usr/lib
331    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
332    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.so* $(1)/usr/lib/
333    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.so* $(1)/usr/lib/
327    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/
328    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/
329    $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.{a,so*} $(1)/usr/lib/
334330    $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
335331    $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/
336332    $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/
...... 
357353define Package/ip6tables/install
358354    $(INSTALL_DIR) $(1)/usr/sbin
359355    $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
360    $(INSTALL_DIR) $(1)/usr/lib/iptables
361    (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
362        $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
363    )
364356endef
365357
366358define Package/ip6tables-utils/install

Archive Download the corresponding diff file

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive