diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-21 19:46:56 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-03-21 19:46:56 +0000 |
| commit | 39b22d0136634f2e0e085fcef4f99432d7e0914c (patch) | |
| tree | 3cf8e085d63f6b698a3bf556f6d28f7af15d93ca | |
| parent | 8412946f34a13e0213bc4495a3cab3edacb30881 (diff) | |
add cifs, disable smbfs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@413 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/linux/Config.in | 6 | ||||
| -rw-r--r-- | package/linux/Makefile | 6 | ||||
| -rw-r--r-- | package/linux/control/kmod-cifs.control (renamed from package/linux/control/kmod-smbfs.control) | 4 | ||||
| -rw-r--r-- | package/linux/kernel-patches/305-cifs-1.20c.bz2 | bin | 0 -> 126312 bytes | |||
| -rw-r--r-- | package/linux/linux.config | 9 | ||||
| -rw-r--r-- | package/linux/linux.mk | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/package/linux/Config.in b/package/linux/Config.in index 3a77a42f58..1275b216c2 100644 --- a/package/linux/Config.in +++ b/package/linux/Config.in @@ -36,11 +36,11 @@ config BR2_PACKAGE_KMOD_NFS Kernel modules for NFS support Includes lockd, nfs and sunrpc -config BR2_PACKAGE_KMOD_SMBFS - tristate "SMB support" +config BR2_PACKAGE_KMOD_CIFS + tristate "CIFS support" default m help - Kernel modules for SMB support + Kernel modules for CIFS support config BR2_PACKAGE_KMOD_USB tristate "USB/SCSI support" diff --git a/package/linux/Makefile b/package/linux/Makefile index 5c74d39eb2..73f82148f7 100644 --- a/package/linux/Makefile +++ b/package/linux/Makefile @@ -53,9 +53,9 @@ $(eval $(call KMOD_template,IPT6,ip6tables,\ $(eval $(call KMOD_template,IPV6,ipv6,\ $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ ,CONFIG_IPV6)) -$(eval $(call KMOD_template,SMBFS,smbfs,\ - $(MODULES_DIR)/kernel/fs/smbfs/smbfs.o \ -,CONFIG_SMB_FS)) +$(eval $(call KMOD_template,CIFS,cifs,\ + $(MODULES_DIR)/kernel/fs/cifs/cifs.o \ +,CONFIG_CIFS)) $(eval $(call KMOD_template,NFS,nfs,\ $(MODULES_DIR)/kernel/fs/lockd/*.o \ $(MODULES_DIR)/kernel/fs/nfs/*.o \ diff --git a/package/linux/control/kmod-smbfs.control b/package/linux/control/kmod-cifs.control index cf8b46e8e7..a70063df62 100644 --- a/package/linux/control/kmod-smbfs.control +++ b/package/linux/control/kmod-cifs.control @@ -1,8 +1,8 @@ -Package: kmod-smbfs +Package: kmod-cifs Priority: optional Section: sys Version: 2.4.29-1 Architecture: mipsel Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> Source: buildroot internal -Description: Kernel modules for SMB support +Description: Kernel modules for CIFS support diff --git a/package/linux/kernel-patches/305-cifs-1.20c.bz2 b/package/linux/kernel-patches/305-cifs-1.20c.bz2 Binary files differnew file mode 100644 index 0000000000..41d835a22d --- /dev/null +++ b/package/linux/kernel-patches/305-cifs-1.20c.bz2 diff --git a/package/linux/linux.config b/package/linux/linux.config index 31900bb6e9..34cc65efee 100644 --- a/package/linux/linux.config +++ b/package/linux/linux.config @@ -891,9 +891,10 @@ CONFIG_NFS_V3=y CONFIG_SUNRPC=m CONFIG_LOCKD=m CONFIG_LOCKD_V4=y -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -# CONFIG_SMB_UNIX is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_POSIX=y +# CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -924,7 +925,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_EFI_PARTITION is not set -CONFIG_SMB_NLS=y +# CONFIG_SMB_NLS is not set CONFIG_NLS=y # diff --git a/package/linux/linux.mk b/package/linux/linux.mk index 322adadc38..02cc3bb8ae 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -112,4 +112,6 @@ linux-dirclean: rm -rf $(LINUX_DIR)-$(LINUX_VERSION) rm -rf $(LINUX_DIR) rm -rf $(BUILD_DIR)/modules + rm -rf $(BUILD_DIR)/wl + rm -rf $(BUILD_DIR)/et |