diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-08 21:45:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-08 21:45:05 +0100 |
| commit | c115a9d1c3c12ce5504a1a5169006c66cafc34e3 (patch) | |
| tree | f4bef63dd572e3fe54b8d5fdbffcbf2e2e78d7a2 /package/nfs-utils/Makefile | |
| parent | 91fb280c3d35424d56c7f9a3bea23f383dfcb56a (diff) | |
many bugfixes for native adksystems and some package updates
Diffstat (limited to 'package/nfs-utils/Makefile')
| -rw-r--r-- | package/nfs-utils/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 1d6e9aa23..e277874c6 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs @@ -23,7 +23,7 @@ PKGCB_WITHOUT_TIRPC:= portmap PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) -PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue +PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss PKGFB_WITH_KERBEROS:= libnfsidmap krb5 libevent libgssglue librpcsecgss DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -32,9 +32,17 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_NATIVE),) +KRB5INC:= ${STAGING_TARGET_DIR}/usr +TIRPCINC:= ${STAGING_TARGET_DIR}/usr/include/tirpc +else +KRB5INC:= /usr +TIRPCINC:= /usr/include/tirpc +endif + ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) CONFIGURE_ARGS+= --enable-nfsv4 \ - --with-krb5=${STAGING_TARGET_DIR}/usr/ \ + --with-krb5=$(KRB5INC) \ --enable-gss CONFIGURE_ENV+= LIBS="-lrpcsecgss" else @@ -44,7 +52,7 @@ endif ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y) CONFIGURE_ARGS+= --enable-tirpc \ - --with-tirpcinclude=${STAGING_TARGET_DIR}/usr/include/tirpc + --with-tirpcinclude=${TIRPCINC} else CONFIGURE_ARGS+= --disable-tirpc endif @@ -57,6 +65,8 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ post-install: ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc + ${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin + ${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \ ${IDIR_NFS_UTILS}/usr/sbin/ |