diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/ipset | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/ipset')
| -rw-r--r-- | package/ipset/Makefile | 8 | ||||
| -rw-r--r-- | package/ipset/ipkg/ipset.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 9828f7774..daaaa72a0 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -9,12 +9,16 @@ PKG_NAME:= ipset PKG_VERSION:= 2.3.3a PKG_RELEASE:= 1 PKG_MD5SUM:= c7d2f165242edaef5581db0f7d5af520 -MASTER_SITES:= http://ipset.netfilter.org/ +PKG_DESCR:= Netfilter ip sets administration utility +PKG_SECTION:= net +PKG_URL:= http://ipset.netfilter.org +PKG_SITES:= http://ipset.netfilter.org/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= KERNEL_DIR=${LINUX_DIR} PREFIX=/usr LD=$(TARGET_CROSS)ld BUILD_STYLE= auto diff --git a/package/ipset/ipkg/ipset.control b/package/ipset/ipkg/ipset.control deleted file mode 100644 index f7f6ae0e6..000000000 --- a/package/ipset/ipkg/ipset.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ipset -Priority: optional -Section: net -Description: Netfilter ip sets administration utility -Depends: kmod-iptables-extra |