diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/ipvsadm/Makefile | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'package/ipvsadm/Makefile')
-rw-r--r-- | package/ipvsadm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/ipvsadm/Makefile b/package/ipvsadm/Makefile index ac7fda27a..918a3a493 100644 --- a/package/ipvsadm/Makefile +++ b/package/ipvsadm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= eac3ba3f62cd4dea2da353aeddd353a8 PKG_DESCR:= IPVS admin utility PKG_SECTION:= net -PKG_DEPENDS:= libpopt kmod-ip-vs +PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt PKG_URL:= http://www.linuxvirtualserver.org/ PKG_SITES:= http://www.linuxvirtualserver.org/software/kernel-2.6/ |