add a workaround preventing opkg to install anything on squashfs-based fs layouts...

[openwrt.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 0670d44..a7829d5 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -185,13 +185,11 @@ define KernelPackage/fs-nfs-common
   TITLE:=Common NFS filesystem modules
   KCONFIG:= \
        CONFIG_LOCKD \
   TITLE:=Common NFS filesystem modules
   KCONFIG:= \
        CONFIG_LOCKD \

-       CONFIG_SUNRPC \
-       CONFIG_NFS_ACL_SUPPORT
+       CONFIG_SUNRPC

   FILES:= \
        $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
   FILES:= \
        $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \

-       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/fs/nfs_common/nfs_acl.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs_acl)
+       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)

 endef
 
 $(eval $(call KernelPackage,fs-nfs-common))
 endef
 
 $(eval $(call KernelPackage,fs-nfs-common))


@@ -202,13 +200,9 @@ define KernelPackage/fs-nfs
   TITLE:=NFS filesystem support
   DEPENDS:=kmod-fs-nfs-common
   KCONFIG:= \
   TITLE:=NFS filesystem support
   DEPENDS:=kmod-fs-nfs-common
   KCONFIG:= \

-       CONFIG_NFS_FS \
-       CONFIG_LOCKD \
-       CONFIG_SUNRPC
+       CONFIG_NFS_FS

   FILES:= \
   FILES:= \

-       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,40,nfs)
 endef
 
   AUTOLOAD:=$(call AutoLoad,40,nfs)
 endef
 


@@ -223,20 +217,17 @@ define KernelPackage/fs-nfsd
   SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
   DEPENDS:=kmod-fs-nfs-common
   SUBMENU:=$(FS_MENU)
   TITLE:=NFS kernel server support
   DEPENDS:=kmod-fs-nfs-common

-  KCONFIG:= \
-       CONFIG_NFSD \
-       CONFIG_EXPORTFS \
-       CONFIG_SUNRPC_GSS
-  FILES:= \
-       $(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_NFSD
+  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
 
 define KernelPackage/fs-nfsd/2.6
   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
 
 define KernelPackage/fs-nfsd/2.6

-#  KCONFIG+=CONFIG_EXPORTFS
-  FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,30,exportfs)
+  KCONFIG+=CONFIG_EXPORTFS \
+       CONFIG_SUNRPC_GSS
+  FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,40,auth_rpcgss exportfs nfsd)

 endef
 
 define KernelPackage/fs-nfsd/description
 endef
 
 define KernelPackage/fs-nfsd/description