diff options
Diffstat (limited to 'recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch')
| -rw-r--r-- | recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch | 23 |
1 files changed, 14 insertions, 9 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 7d26ecf2..805c00ac 100644 --- a/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch +++ b/recipes-extended/glusterfs/files/xlator-host-contamination-3.4.patch @@ -1,3 +1,8 @@ +From 79c943bba37cb10a462038ec56cd2b8045344951 Mon Sep 17 00:00:00 2001 +From: Donn Seeley <donn.seeley@windriver.com> +Date: Fri, 28 Feb 2014 09:11:02 -0500 +Subject: [PATCH] Add the glusterfs package + Three of the translator makefiles in glusterfs add unnecessary -L$(xlatordir) link options. This option causes the linker to check the host's $(xlatordir) directory, resulting in contamination that gets @@ -8,6 +13,7 @@ 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 -- @@ -15,10 +21,10 @@ Signed-off-by: Xuin Sun <xulin.sun@windriver.com> 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 +index b0f5a9b..0caad43 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am -@@ -54,7 +54,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ +@@ -55,7 +55,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS) @@ -28,21 +34,23 @@ index a8f27fb..8243bf0 100644 CLEANFILES = diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am -index f91bbcf..b16bb9b 100644 +index bc6f8e9..56086a1 100644 --- a/xlators/nfs/server/src/Makefile.am +++ b/xlators/nfs/server/src/Makefile.am -@@ -22,6 +22,4 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ +@@ -25,8 +25,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ AM_CFLAGS = -Wall $(GF_CFLAGS) -AM_LDFLAGS = -L$(xlatordir) - CLEANFILES = + + EXTRA_DIST = nfsserver.sym diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am -index bc5fbc2..0b9fabe 100644 +index f57070c..70080a6 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_srcdir)/libglusterfs/src +@@ -12,8 +12,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ AM_CFLAGS = -Wall $(GF_CFLAGS) @@ -51,6 +59,3 @@ index bc5fbc2..0b9fabe 100644 CLEANFILES = access-control-compat: --- -1.9.1 - |