diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/iptables/Makefile | |
parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/iptables/Makefile')
-rw-r--r-- | package/iptables/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 8557c0e64..a76a77cd7 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.20 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 387b92d3efcf4f07fe31c3bf0f1d18f5 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall @@ -18,9 +18,7 @@ PKG_DEPENDS+= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 PKG_DEPENDS+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ - -PKG_SUBPKGS:= IPTABLES IPTABLES_DEV -PKGSC_IPTABLES_DEV:= devel +PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -30,8 +28,7 @@ include ${TOPDIR}/mk/package.mk # use --disable-static in CONFIGURE_ARGS to change and optimize package #include ${LINUX_DIR}/.config -$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV})) +$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_LDFLAGS+= -fPIC CONFIGURE_ARGS+= --enable-devel @@ -49,8 +46,4 @@ iptables-install: ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib -iptables-dev-install: - ${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk |