author | Channappa BV<channappa.vakkalad@oracle.com> |
Mon, 07 Nov 2016 21:42:07 -0800 | |
branch | s11u3-sru |
changeset 7260 | ddfed786ecc4 |
parent 7067 | 776b367d2e46 |
permissions | -rw-r--r-- |
7067
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
in-house |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
Oracle HSM (originally known as: SAMFS - Storage Archivation Management + QFS) |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
support of off-laid/staged files. SMB offers "off-line" flag for off-laid files |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
so the SMB client can behave accordingly to such file-status: |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
- explorer do not create thumbnails to avoid staging of all files in browsed dir. |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
- explorer display a small "hand-watch" symbol in the corner of file-icon |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
note: MacOS X ignore the "off-line" flag in SMB protocol. |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
Originally promoted into the community by: |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
https://bugzilla.samba.org/show_bug.cgi?id=5780 |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
...but during the SAMFS version change also the licensing conditions |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
has changed so the community rejected to adopt the SAMFS support. |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
--- a/source3/wscript 2016-08-03 06:29:54.129142866 -0700 |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
+++ b/source3/wscript 2016-08-03 06:15:24.109052374 -0700 |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -1549,6 +1549,13 @@ |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs'): |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
conf.DEFINE('HAVE_CEPH', '1') |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
22 |
+ if conf.CHECK_CFG(package='samfs', args="--cflags --libs", msg='Check for Oracle HSM (aka. SAMFS) API.', uselib_store="SAMFS") : |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
23 |
+ conf.SET_TARGET_TYPE('samfs', 'SYSLIB') |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
24 |
+ conf.CHECK_HEADERS('samfs/lib.h samfs/stat.h', lib='samfs') |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
25 |
+ conf.env['LINKFLAGS_SAMFS'] = [ '-R/opt/SUNWsamfs/lib' ] |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
26 |
+ conf.CHECK_FUNCS('sam_stat', lib='samfs') |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
27 |
+ default_shared_modules.extend(TO_LIST('vfs_samfs')) |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
28 |
+ |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
29 |
if Options.options.with_glusterfs: |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
30 |
conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 4" --cflags --libs', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
31 |
msg='Checking for glusterfs-api >= 4', uselib_store="GFAPI") |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
32 |
--- a/source3/modules/wscript_build 2016-01-26 12:25:54.000000000 -0800 |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
33 |
+++ b/source3/modules/wscript_build 2016-07-28 16:27:45.819924564 -0700 |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
34 |
@@ -194,6 +194,14 @@ |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
35 |
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'), |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
36 |
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_solarisacl')) |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
37 |
|
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
38 |
+bld.SAMBA3_MODULE('vfs_samfs', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
39 |
+ subsystem='vfs', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
40 |
+ source='vfs_samfs.c', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
41 |
+ deps='samba-util samfs', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
42 |
+ init_function='', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
43 |
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_samfs'), |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
44 |
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_samfs')) |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
45 |
+ |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
46 |
bld.SAMBA3_MODULE('vfs_zfsacl', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
47 |
subsystem='vfs', |
776b367d2e46
24354183 Samba: Update to 4.4.5
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
48 |
source='vfs_zfsacl.c', |