Attachment 10545 Details for Bug 11014 – Patches for samba-4.2

[patch] Patches for samba-4.2

samba-4.2-ctdb.patches (text/plain), 4.80 KB, created by Amitay Isaacs on 2014-12-17 08:35:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2014-12-17 08:35:12 UTC

Size: 4.80 KB

patch

obsolete

>From 205a2d838fb3129f3de1cc6d293501bbcc195f1f Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Mon, 15 Dec 2014 21:14:44 +1100
>Subject: [PATCH 1/4] ctdb-build: Fix the indentation
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 641bb5eab344fe85fb93898d5a8bc08d35e11fdc)
>---
> ctdb/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index 788aa5e..dfae5b4 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -451,7 +451,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):
>-- 
>1.9.3
>
>
>From 15ffcbb1b0906e0690d79f08c5ee6d580c34934e Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Mon, 15 Dec 2014 21:15:24 +1100
>Subject: [PATCH 2/4] ctdb-build: Fix the installation of config files for
> top-level build
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit be241207c29357c3cbda2eddb1002930d2e0592c)
>---
> ctdb/wscript | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index dfae5b4..e4294c3 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -464,8 +464,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])
>@@ -483,7 +488,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',
>-- 
>1.9.3
>
>
>From 217edd61118e1d871dc04ef27088296f2238e12a Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Mon, 15 Dec 2014 00:07:33 +1100
>Subject: [PATCH 3/4] packaging: Include CTDB man pages in the tarball
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 0f7aae85804889e586c0ce88563af0720e55bd3f)
>---
> wscript | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/wscript b/wscript
>index 236603e..ad2e2a8 100644
>--- a/wscript
>+++ b/wscript
>@@ -305,6 +305,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)
> 
>-- 
>1.9.3
>
>
>From 2f77dd096328d8a3d203d47d8393be1cbb1a8438 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 1 Dec 2014 13:28:13 +0100
>Subject: [PATCH 4/4] ctdb-build: fix build without xsltproc
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Check for XSLTPROC_MANPAGES before trying to build the docs.
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 8d5f58120b6eeb73d1dc3c4df2ec6e12170888aa)
>---
> ctdb/wscript | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index e4294c3..3e2a992 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -433,9 +433,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)
>-- 
>1.9.3
>

Flags:

metze: review+
obnox: review+

Actions: View

Attachments on bug 11014: 10545