1 files changed, 11 insertions, 7 deletions

diff --git a/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch b/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
index 8f3c854..6278ce6 100644
--- a/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-configure-automake-with-subdir-objects-for.patch
@@ -1,6 +1,6 @@
-From bb34fd21ae26005cf099928f41e68a0d98685eba Mon Sep 17 00:00:00 2001
-From: Xulin Sun <xulin.sun@windriver.com>
-Date: Mon, 21 Mar 2016 17:32:50 +0800
+From fcd612f75c2e99a0748bebbf530b730d0019d2bf Mon Sep 17 00:00:00 2001
+From: "Hongzhi.Song" <hongzhi.song@windriver.com>
+Date: Wed, 24 Apr 2019 22:33:49 -0400
 Subject: [PATCH] glusterfs: configure: automake with subdir-objects & foreign
  parameters
 
@@ -10,21 +10,22 @@ autoconf execution failed when using automake 1.14 around version.
 Upstream-Status: Pending
 
 Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
-
+[modify the patch for release-6.1]
+Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
 ---
  configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 43efd6d..8ce28f6 100644
+index 2f341de..b28ac20 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,11 +13,11 @@ AC_INIT([glusterfs],
  AC_SUBST([PACKAGE_RELEASE],
           [m4_esyscmd([build-aux/pkg-version --release])])
  
--AM_INIT_AUTOMAKE(tar-pax)
-+#AM_INIT_AUTOMAKE(tar-pax)
+-AM_INIT_AUTOMAKE([tar-pax foreign])
++#AM_INIT_AUTOMAKE([tar-pax foreign])
  
  # Removes warnings when using automake 1.14 around (...but option 'subdir-objects' is disabled )
  #but libglusterfs fails to build with contrib (Then are not set up that way?)
@@ -33,3 +34,6 @@ index 43efd6d..8ce28f6 100644
  
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
  
+-- 
+2.8.1
+