samba works now

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7226 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 108 insertions, 12 deletions

diff --git a/rules/samba.in b/rules/samba.in
index 628570b04..8ad63c137 100644
--- a/rules/samba.in
+++ b/rules/samba.in
@@ -3,6 +3,9 @@
 menuconfig SAMBA
 	bool
 	prompt "samba                         "
+	select GLIBC
+	select GLIBC_NSL
+	select GLIBC_RESOLV
 	help
 	  Samba is an Open Source/Free Software suite that has, since
 	  1992, provided file and print services to all manner of
@@ -22,13 +25,6 @@ menuconfig SAMBA
 #   --enable-krb5developer  Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)
 #   --enable-dmalloc        Enable heap debugging default=no
 
-	config SAMBA_CUPS
-		bool
-		depends on SAMBA
-		prompt "cups support"
-		depends on BROKEN
-		help
-		  Turn on CUPS support
 
 #   --enable-iprint         Turn on iPrint support (default=yes if cups is yes)
 #
@@ -86,16 +82,116 @@ menuconfig SAMBA
 #   --with-static-modules=MODULES  Comma-seperated list of names of modules to statically link in
 #   --with-shared-modules=MODULES  Comma-seperated list of names of modules to build shared
 
-	config SAMBA_SMBD
+	config SAMBA_COMMON
 		bool
 		depends on SAMBA
-		prompt "install smbd"
+		default y
+		prompt "Samba common files"
 		help
 		  Install smbd daemon on target.
 
-	config SAMBA_NMBD
+	config ROOTFS_ETC_SAMBA_CONFIG
+		bool
+		depends on SAMBA
+		depends on SAMBA_SERVER
+	choice
+		prompt "Kind of samba config file"
+		depends on SAMBA
+		depends on SAMBA_COMMON
+		default ROOTFS_ETC_SAMBA_CONFIG_DEFAULT
+
+		config ROOTFS_ETC_SAMBA_CONFIG_DEFAULT
+			bool
+			prompt "Use generic"
+			help
+			  Installs a generic /etc/samba/smb.conf file.
+
+		config ROOTFS_ETC_SAMBA_CONFIG_USER
+			bool
+			prompt "User defined"
+			help
+			  This uses a user defined config file. Will use
+			  the file out of projectroot/etc/samba/smb.conf
+	endchoice
+
+	config SAMBA_SERVER
+		bool
+		depends on SAMBA
+		select SAMBA_COMMON
+		prompt "Samba server"
+		help
+		  Installs samba server. ATTENTION: You need rw access to your
+		  rootfs before starting the samba server!
+
+	config ROOTFS_ETC_SAMBA_SECRETS_USER
+		bool
+		depends on SAMBA
+		depends on SAMBA_SERVER
+		prompt "User defined smb password Database"
+		help
+		  This will install the /etc/samba/secrets.tdb from
+		  projectroot/etc/samba/secrets.tdb. If you wish to run samba
+		  in user security level and use you own userdatabase. You will
+		  have to enable this. If you say n here. The samba server will
+		  generates his own secrets.tdb after initialisation.
+
+	config ROOTFS_ETC_INITD_SAMBA
 		bool
 		depends on SAMBA
-		prompt "install nmbd"
+		depends on SAMBA_SERVER
+		select BB_CONFIG_START_STOP_DAEMON      if BUSYBOX
+		default y
+		choice
+			prompt "Kind of samba start script"
+			depends on SAMBA
+			depends on SAMBA_SERVER
+			default ROOTFS_ETC_INITD_SAMBA_DEFAULT
+
+			config ROOTFS_ETC_INITD_SAMBA_DEFAULT
+				bool
+				prompt "Use generic"
+				help
+			  	  Installs a generic /etc/init.d/samba file.
+
+			config ROOTFS_ETC_INITD_SAMBA_USER
+				bool
+				prompt "User defined"
+				help
+				  This uses a user defined init file. Will use
+				  the file out of projectroot/etc/init.d/samba
+		endchoice
+
+	config SAMBA_CLIENT
+		bool
+		depends on SAMBA
+		select SAMBA_COMMON
+		prompt "Samba client"
 		help
-		  Install nmbd daemon on target.
+		  Installs some client components of the Samba suite.
+	
+	config SAMBA_LIBCLIENT
+		bool
+		depends on SAMBA
+		select SAMBA_COMMON
+		prompt "Samba client library"
+		help
+		  Installs the libsmbclient shared library.
+
+	config SAMBA_SMBFS
+		bool
+		depends on SAMBA
+		select SAMBA_COMMON
+		prompt "Samba file system"
+		help
+		  Enables the sytem to mount windows share via SMB protocol
+
+	config SAMBA_CUPS
+		bool
+		depends on SAMBA
+		depends on BROKEN
+		prompt "cups support"
+		help
+		  Turn on CUPS support
+
+# TODO: We might want to provide alternative smb.conf file for i.E. other security
+# level