This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 82d25bae628797aa3af43c077b29b30fa91d6b30 (commit) via 3b3fa6775b2d04f1ff4d083a160674980f3c2035 (commit) from 1ea4ab1783b4484d903f9819d122cfaf9f3b4659 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 82d25bae628797aa3af43c077b29b30fa91d6b30 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Mon May 29 20:27:25 2017 +0200
samba 3.6.25: fixes for lfs-file
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 Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3b3fa6775b2d04f1ff4d083a160674980f3c2035 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 25 20:16:13 2017 +0100
flash-image: Increase size of root partition
This should still be small enough to barely fit on a disk that can hold 1GB of data. The actual one. Not the one that some vendors put on it.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/flash-images | 4 ++-- lfs/samba | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-)
Difference in files: diff --git a/lfs/flash-images b/lfs/flash-images index 4a1a4d6..0754796 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -75,9 +75,9 @@ else endif
# /boot: 64MB - OFFSET -# / : 750MB +# / : 850MB S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) ))) -S_ROOT := 1536000 +S_ROOT := 1740800
PADDING = 100 # MB
diff --git a/lfs/samba b/lfs/samba index 8f0b946..b29db02 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
hooks/post-receive -- IPFire 2.x development tree