diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-17 15:31:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-17 15:31:35 +0200 |
| commit | 84c31b40f46deb658835e30944fc5f8526988752 (patch) | |
| tree | 668984e3a4f3d9d27c5d49aae95a2e85b888963c | |
| parent | bdebe2b803c72c7c8c615a37ff35fd32510b297c (diff) | |
| parent | 6b3ceb6798879b655f2233abe484906365172e31 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | package/nfs-utils/Makefile | 12 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fsnet | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 4085a4c7d..ca1bf178c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1100,7 +1100,7 @@ endif $(eval $(call KMOD_template,NFSD,nfsd,\ $(MODULES_DIR)/kernel/fs/nfsd/nfsd \ -,30)) +,30, kmod-sunrpc kmod-lockd)) $(eval $(call KMOD_template,NTFS_FS,ntfs-fs,\ $(MODULES_DIR)/kernel/fs/ntfs/ntfs \ diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 122b1f28a..689e69ae8 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= fb48630b7c145fb9d6602a79c6eaab11 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper -PKG_DEPENDS+= libpthread +PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper libpthread +PKG_FDEPENDS:= $(PKG_DEPENDS) PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs # as long as there are tar archives of nfs-utils with object files @@ -25,9 +25,13 @@ PKGFB_WITH_KERBEROS:= libnfsidmap krb5 libevent libgssglue librpcsecgss DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) +PKG_FDEPENDS+= $(PKGFS_WITH_KERBEROS) +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_NATIVE),) KRB5INC:= ${STAGING_TARGET_DIR}/usr diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index ab3087f4a..77871f171 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -1,3 +1,7 @@ +config ADK_KERNEL_FS_POSIX_ACL + boolean + default y + config ADK_KPACKAGE_KMOD_CIFS prompt "kmod-fs-cifs...................... CIFS support" tristate |