samba 3.6.25: fixes for lfs-file

Submitted by Matthias Fischer on May 29, 2017, 6:27 p.m.

Details

Message ID 20170529182725.2099-1-matthias.fischer@ipfire.org
State Accepted
Commit 4efce2359f8ac38a5d3ae53ad1eb45b70e86242f
Headers show

Commit Message

Matthias Fischer May 29, 2017, 6:27 p.m.
Removed 'unrecognized' configure-options.

Deleted empty tab at line end and moved line '-mkdir -p /var/ipfire/samba'
because of error message:
'mkdir: cannot create directory ‘/var/ipfire/samba’: File exists'

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/samba | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/lfs/samba b/lfs/samba
index 8f0b946ec..b29db0209 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -54,7 +54,7 @@  download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -170,10 +170,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-libsmbclient \
 		--with-libsmbsharemodes \
 		--with-sendfile-support \
-		--without-smbwrapper \
-		--with-mmap \
 		--with-fhs \
-		--with-vfs \
 		--with-winbind \
 		--disable-swat \
 		--enable-cups \
@@ -187,8 +184,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	#cd $(DIR_APP)/source3 && install -v -m755 nsswitch/libnss_winbind.so /lib
 	#cd $(DIR_APP)/source3 && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
 	#cd $(DIR_APP)/source3 && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
+	-mkdir -p /var/ipfire/samba
 	cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
-	-mkdir -p /var/ipfire/samba	
 	cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
 	chown nobody:nobody -R /var/ipfire/samba/
 	cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global