[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Mon Dec 15 08:21:02 MST 2014
The branch, master has been updated
via 4958fcd script/autobuild.py: build the samba target with --with-profiling-data
via 8d5f581 ctdb-build: fix build without xsltproc
via 0f7aae8 packaging: Include CTDB man pages in the tarball
via be24120 ctdb-build: Fix the installation of config files for top-level build
via 641bb5e ctdb-build: Fix the indentation
from daff0f5 libcli/smb: only force signing of smb2 session setups when binding a new session
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4958fcdfa30fd9d8dc51ceafaab35721e61e72c7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 8 10:30:56 2014 +0100
script/autobuild.py: build the samba target with --with-profiling-data
In future we may get also runtime tests for profiling...
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Mon Dec 15 16:20:14 CET 2014 on sn-devel-104
commit 8d5f58120b6eeb73d1dc3c4df2ec6e12170888aa
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 1 13:28:13 2014 +0100
ctdb-build: fix build without xsltproc
Check for XSLTPROC_MANPAGES before trying to build the docs.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 0f7aae85804889e586c0ce88563af0720e55bd3f
Author: Amitay Isaacs <amitay at gmail.com>
Date: Mon Dec 15 00:07:33 2014 +1100
packaging: Include CTDB man pages in the tarball
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit be241207c29357c3cbda2eddb1002930d2e0592c
Author: Amitay Isaacs <amitay at gmail.com>
Date: Mon Dec 15 21:15:24 2014 +1100
ctdb-build: Fix the installation of config files for top-level build
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 641bb5eab344fe85fb93898d5a8bc08d35e11fdc
Author: Amitay Isaacs <amitay at gmail.com>
Date: Mon Dec 15 21:14:44 2014 +1100
ctdb-build: Fix the indentation
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/wscript | 18 ++++++++++++------
script/autobuild.py | 2 +-
wscript | 3 +++
3 files changed, 16 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/wscript b/ctdb/wscript
index f346f97..1400685 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -436,9 +436,10 @@ def build(bld):
bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/README',
destname='README')
- bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
- doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
- True)
+ if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ bld.MANPAGES('''doc/onnode.1 doc/ctdbd_wrapper.1 doc/ctdbd.conf.5
+ doc/ctdb.7 doc/ctdb-statistics.7 doc/ctdb-tunables.7''',
+ True)
bld.INSTALL_FILES('${BINDIR}', 'tools/onnode',
destname='onnode', chmod=0755)
@@ -454,7 +455,7 @@ def build(bld):
continue
mode = os.lstat(fl).st_mode & 0777
if arg['trim_path']:
- fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
+ fl = samba_utils.os_path_relpath(fl, arg['trim_path'])
arg['file_list'].append([fl, mode])
def SUBDIR_MODE(path, trim_path=None):
@@ -467,8 +468,13 @@ def build(bld):
'nfs-rpc-checks.d'
]
+ if bld.env.standalone_ctdb:
+ configdir = 'config'
+ else:
+ configdir = 'ctdb/config'
+
for t in etc_subdirs:
- files = SUBDIR_MODE('config/%s' % t, trim_path='config')
+ files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
for fmode in files:
bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
@@ -486,7 +492,7 @@ def build(bld):
]
for t in etc_scripts:
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/' + t,
+ bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
destname=t, chmod=0755)
bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
diff --git a/script/autobuild.py b/script/autobuild.py
index ba08e52..1097316 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -44,7 +44,7 @@ tasks = {
("clean", "make clean", "text/plain") ],
# We have 'test' before 'install' because, 'test' should work without 'install'
- "samba" : [ ("configure", "./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
+ "samba" : [ ("configure", "./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-profiling-data", "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
("install", "make install", "text/plain"),
diff --git a/wscript b/wscript
index d851885..d5a4ccb 100644
--- a/wscript
+++ b/wscript
@@ -309,6 +309,9 @@ def dist():
'''makes a tarball for distribution'''
sambaversion = samba_version.load_version(env=None)
+ os.system("make -C ctdb/doc")
+ samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True)
+
os.system(srcdir + "/release-scripts/build-manpages-nogit")
samba_dist.DIST_FILES('bin/docs:docs', extend=True)
--
Samba Shared Repository
More information about the samba-cvs
mailing list