glusterfs: uprev to 3.11.1

* Add systemd support

* Drop the following patch which already fixed in upstream:
  0001-Fix-for-mount.glusterfs-not-accepting-version-argume.patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 23 insertions, 11 deletions

diff --git a/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch b/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch
index 16cc47e..7d26ecf 100644
--- a/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch
+++ b/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch
@@ -4,36 +4,45 @@ the host's $(xlatordir) directory, resulting in contamination that gets
 flagged by Yocto's QA rules.
 
 Upstream-Status: Pending
+
 Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
+[Xulin: minor adjust to apply the patch]
+Signed-off-by: Xuin Sun <xulin.sun@windriver.com>
 ---
- xlators/mgmt/glusterd/src/Makefile.am    |    2 --
- xlators/nfs/server/src/Makefile.am       |    2 --
- xlators/system/posix-acl/src/Makefile.am |    2 --
- 3 files changed, 6 deletions(-)
+ xlators/mgmt/glusterd/src/Makefile.am    | 2 +-
+ xlators/nfs/server/src/Makefile.am       | 2 --
+ xlators/system/posix-acl/src/Makefile.am | 2 --
+ 3 files changed, 1 insertion(+), 5 deletions(-)
 
+diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+index a8f27fb..8243bf0 100644
 --- a/xlators/mgmt/glusterd/src/Makefile.am
 +++ b/xlators/mgmt/glusterd/src/Makefile.am
-@@ -33,8 +33,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_src
+@@ -54,7 +54,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
  
- AM_CFLAGS = -Wall $(GF_CFLAGS)
+ AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS)
+ 
+-AM_LDFLAGS = -L$(xlatordir) $(URCU_LIBS) $(URCU_CDS_LIBS)
++AM_LDFLAGS = -L$(URCU_LIBS) $(URCU_CDS_LIBS)
  
--AM_LDFLAGS = -L$(xlatordir)
--
  CLEANFILES =
  
- install-data-hook:
+diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
+index f91bbcf..b16bb9b 100644
 --- a/xlators/nfs/server/src/Makefile.am
 +++ b/xlators/nfs/server/src/Makefile.am
-@@ -19,6 +19,4 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+@@ -22,6 +22,4 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
  
  AM_CFLAGS = -Wall $(GF_CFLAGS)
  
 -AM_LDFLAGS = -L$(xlatordir)
 -
  CLEANFILES =
+diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
+index bc5fbc2..0b9fabe 100644
 --- a/xlators/system/posix-acl/src/Makefile.am
 +++ b/xlators/system/posix-acl/src/Makefile.am
-@@ -10,8 +10,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_src
+@@ -10,8 +10,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
  
  AM_CFLAGS = -Wall $(GF_CFLAGS)
  
@@ -42,3 +51,6 @@ Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
  CLEANFILES =
  
  access-control-compat:
+-- 
+1.9.1
+