Description: Patches for v4-5-test

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2016-08-09 06:56:52 UTC

Size: 4.14 KB

patch

>From 9b263ada90b2dc9ec36f37c74915380ab8b7aaf4 Mon Sep 17 00:00:00 2001 >From: Ira Cooper <ira@samba.org> >Date: Tue, 26 Jul 2016 11:22:43 -0400 >Subject: [PATCH 1/2] source3/wscript: Add support for disabling vfs_cephfs > >--enable-cephfs and --disable-cephfs both work now. > >--enable-cephfs is the default to match previous >versions of Samba. > >Signed-off-by: Ira Cooper <ira@samba.org> >Reviewed-by: Steve French <sfrench@samba.org> >Tested-by: Steve French <sfrench@samba.org> > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=12133 > >(cherry picked from commit 38bb993657f8eb6c49899de0d741ed5186ca5022) >--- > source3/wscript | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/source3/wscript b/source3/wscript >index 497b673..fe3f40f 100644 >--- a/source3/wscript >+++ b/source3/wscript >@@ -69,6 +69,7 @@ def set_options(opt): > action="store", dest='libcephfs_dir', default=None) > > opt.SAMBA3_ADD_OPTION('glusterfs', with_name="enable", without_name="disable", default=True) >+ opt.SAMBA3_ADD_OPTION('cephfs', with_name="enable", without_name="disable", default=True) > > opt.add_option('--enable-vxfs', > help=("enable support for VxFS (default=no)"), >-- >1.9.1 > > >From e4abd08b84cb72613afc7c17967a3ec5f91a7c33 Mon Sep 17 00:00:00 2001 >From: Ira Cooper <ira@samba.org> >Date: Tue, 26 Jul 2016 11:44:47 -0400 >Subject: [PATCH 2/2] buildscripts: Fix the regression with > --without-acl-support. > >This will disable the vfs_glusterfs and vfs_cephfs modules if >you provide --without-acl-support. > >In addition it makes compiling in POSIXACL_XATTR conditional >on vfs_glusterfs or vfs_cephfs being built in. > >Signed-off-by: Ira Cooper <ira@samba.org> >Reviewed-by: Steve French <sfrench@samba.org> >Tested-by: Steve French <sfrench@samba.org> > >Autobuild-User(master): Ira Cooper <ira@samba.org> >Autobuild-Date(master): Mon Aug 8 21:27:46 CEST 2016 on sn-devel-144 > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=12133 > >(cherry picked from commit 14f29c4f560f1b3942245a6fa43924a8ce45d99d) >--- > source3/modules/wscript_build | 1 + > source3/wscript | 15 +++++++++++---- > 2 files changed, 12 insertions(+), 4 deletions(-) > >diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build >index 2d42a82..a5d8407 100644 >--- a/source3/modules/wscript_build >+++ b/source3/modules/wscript_build >@@ -6,6 +6,7 @@ bld.SAMBA3_SUBSYSTEM('NFS4_ACLS', > > bld.SAMBA3_SUBSYSTEM('POSIXACL_XATTR', > source='posixacl_xattr.c', >+ enabled=(bld.SAMBA3_IS_ENABLED_MODULE('vfs_ceph') or bld.SAMBA3_IS_ENABLED_MODULE('vfs_glusterfs')), > deps='acl attr') > > bld.SAMBA3_LIBRARY('non_posix_acls', >diff --git a/source3/wscript b/source3/wscript >index fe3f40f..5ce1b77 100644 >--- a/source3/wscript >+++ b/source3/wscript >@@ -1579,8 +1579,12 @@ main() { > conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include' > conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib' > >- if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'): >- conf.DEFINE('HAVE_CEPH', '1') >+ if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs: >+ if Options.options.with_acl_support: >+ conf.DEFINE('HAVE_CEPH', '1') >+ else: >+ Logs.warn("ceph support disabled due to --without-acl-support") >+ conf.undefine('HAVE_CEPH') > > if Options.options.with_glusterfs: > conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', >@@ -1589,9 +1593,12 @@ main() { > conf.CHECK_LIB('gfapi', shlib=True) > > if conf.CONFIG_SET('HAVE_API_GLFS_H'): >- conf.DEFINE('HAVE_GLUSTERFS', '1') >+ if Options.options.with_acl_support: >+ conf.DEFINE('HAVE_GLUSTERFS', '1') >+ else: >+ Logs.warn("GlusterFS support disabled due to --without-acl-support") >+ conf.undefine('HAVE_GLUSTERFS') > else: >- conf.SET_TARGET_TYPE('gfapi', 'EMPTY') > conf.undefine('HAVE_GLUSTERFS') > else: > conf.SET_TARGET_TYPE('gfapi', 'EMPTY') >-- >1.9.1 > View Attachment As Raw

Flags:

metze: review? (slow)
vl: review+
metze: review? (ira)
metze: review? (jra)
metze: review? (obnox)