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/nfs-utils | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/nfs-utils')
| -rw-r--r-- | package/nfs-utils/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index ac45e4f86..1bc5f7b69 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -15,10 +15,8 @@ PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} PKG_SUBPKGS:= NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER -PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc PKGSD_NFS_UTILS_CLIENT:=client utilities PKGSN_NFS_UTILS_CLIENT:=nfs-utils -PKGSS_NFS_UTILS_SERVER:=kmod-nfsd kmod-sunrpc PKGSD_NFS_UTILS_SERVER:=server daemons and utilities PKGSN_NFS_UTILS_SERVER:=nfs-utils @@ -26,7 +24,7 @@ PKG_CHOICES_NFS_UTILS:= V3 V4 PKGCD_V3:= NFS version 3 PKGCD_V4:= NFS version 4 PKGCB_V4:= libevent libnfsidmap krb5 libgssglue librpcsecgss -PKGCS_V4:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss +PKGCS_V4:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 |