diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-04-13 08:28:21 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-13 15:55:13 -0400 |
commit | f34fab4825f838f242ba3c953974d17acfe4403d (patch) | |
tree | b60bd84b849d9058071d497d5950d0a46f28dfb0 /recipes-extended | |
parent | 71e038b0094a028f1a41387e6e097cbbf20e485a (diff) | |
download | meta-cloud-services-f34fab4825f838f242ba3c953974d17acfe4403d.tar.gz |
glusterfs: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-extended')
10 files changed, 53 insertions, 55 deletions
diff --git a/recipes-extended/glusterfs/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/recipes-extended/glusterfs/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch index a33ffce..e146f7d 100644 --- a/recipes-extended/glusterfs/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch +++ b/recipes-extended/glusterfs/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d535a5448191d433e328b0a25a0710da203c44e7 Mon Sep 17 00:00:00 2001 | 1 | From ff524f14ba93eb422963c8009a108516639d9b3a Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Wed, 19 Jul 2017 09:40:57 +0800 | 3 | Date: Wed, 19 Jul 2017 09:40:57 +0800 |
4 | Subject: [PATCH] configure.ac: allow PYTHON values to be passed via env | 4 | Subject: [PATCH] configure.ac: allow PYTHON values to be passed via env |
@@ -8,15 +8,16 @@ Allow the recipe can specify specific values for PYTHON. | |||
8 | Upstream-Status: Inappropriate [embedded specific] | 8 | Upstream-Status: Inappropriate [embedded specific] |
9 | 9 | ||
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
11 | |||
11 | --- | 12 | --- |
12 | configure.ac | 26 ++++++++++---------------- | 13 | configure.ac | 26 ++++++++++---------------- |
13 | 1 file changed, 10 insertions(+), 16 deletions(-) | 14 | 1 file changed, 10 insertions(+), 16 deletions(-) |
14 | 15 | ||
15 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
16 | index 43efd6d..7a31038 100644 | 17 | index 8e0652a..f49b9b3 100644 |
17 | --- a/configure.ac | 18 | --- a/configure.ac |
18 | +++ b/configure.ac | 19 | +++ b/configure.ac |
19 | @@ -544,9 +544,6 @@ fi | 20 | @@ -546,9 +546,6 @@ fi |
20 | dnl Check if version matches that we require | 21 | dnl Check if version matches that we require |
21 | PYTHONDEV_CPPFLAGS= | 22 | PYTHONDEV_CPPFLAGS= |
22 | PYTHONDEV_LDFLAGS= | 23 | PYTHONDEV_LDFLAGS= |
@@ -26,7 +27,7 @@ index 43efd6d..7a31038 100644 | |||
26 | have_python2=no | 27 | have_python2=no |
27 | have_Python_h=no | 28 | have_Python_h=no |
28 | 29 | ||
29 | @@ -555,25 +552,22 @@ if echo $PYTHON_VERSION | grep -q ^2; then | 30 | @@ -557,25 +554,22 @@ if echo $PYTHON_VERSION | grep -q ^2; then |
30 | 31 | ||
31 | dnl Use pkg-config to get runtime search patch missing from ${PYTHON}-config | 32 | dnl Use pkg-config to get runtime search patch missing from ${PYTHON}-config |
32 | dnl Just do "true" on failure so that configure does not bail out | 33 | dnl Just do "true" on failure so that configure does not bail out |
@@ -62,6 +63,3 @@ index 43efd6d..7a31038 100644 | |||
62 | AC_SUBST(BUILD_PYTHON_SITE_PACKAGES) | 63 | AC_SUBST(BUILD_PYTHON_SITE_PACKAGES) |
63 | AC_SUBST(BUILD_PYTHON_INC) | 64 | AC_SUBST(BUILD_PYTHON_INC) |
64 | AC_SUBST(BUILD_PYTHON_LIB) | 65 | AC_SUBST(BUILD_PYTHON_LIB) |
65 | -- | ||
66 | 1.9.1 | ||
67 | |||
diff --git a/recipes-extended/glusterfs/files/dependence-on-correct-header-file-path.patch b/recipes-extended/glusterfs/files/dependence-on-correct-header-file-path.patch index ff885f1..4096cd5 100644 --- a/recipes-extended/glusterfs/files/dependence-on-correct-header-file-path.patch +++ b/recipes-extended/glusterfs/files/dependence-on-correct-header-file-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f5bb2a133292b37cd45e3c393e4d43364fe9a11a Mon Sep 17 00:00:00 2001 | 1 | From e585cea1d27be3769c33cf1c0a38bf0de41e2bf9 Mon Sep 17 00:00:00 2001 |
2 | From: Xulin Sun <xulin.sun@windriver.com> | 2 | From: Xulin Sun <xulin.sun@windriver.com> |
3 | Date: Tue, 22 Mar 2016 16:05:32 +0800 | 3 | Date: Tue, 22 Mar 2016 16:05:32 +0800 |
4 | Subject: [PATCH] dependence on correct header file path | 4 | Subject: [PATCH] dependence on correct header file path |
@@ -10,12 +10,13 @@ No such file or directory | |||
10 | Upstream-Status: Inappropriate [embedded specific] | 10 | Upstream-Status: Inappropriate [embedded specific] |
11 | 11 | ||
12 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 12 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | xlators/features/glupy/src/glupy.c | 2 +- | 15 | xlators/features/glupy/src/glupy.c | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 17 | ||
17 | diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c | 18 | diff --git a/xlators/features/glupy/src/glupy.c b/xlators/features/glupy/src/glupy.c |
18 | index 7bb88c0..648b966 100644 | 19 | index bca4764..7c2b271 100644 |
19 | --- a/xlators/features/glupy/src/glupy.c | 20 | --- a/xlators/features/glupy/src/glupy.c |
20 | +++ b/xlators/features/glupy/src/glupy.c | 21 | +++ b/xlators/features/glupy/src/glupy.c |
21 | @@ -10,7 +10,7 @@ | 22 | @@ -10,7 +10,7 @@ |
@@ -25,8 +26,5 @@ index 7bb88c0..648b966 100644 | |||
25 | -#include <Python.h> | 26 | -#include <Python.h> |
26 | +#include <python2.7/Python.h> | 27 | +#include <python2.7/Python.h> |
27 | 28 | ||
28 | #ifndef _CONFIG_H | 29 | #include "glusterfs.h" |
29 | #define _CONFIG_H | 30 | #include "xlator.h" |
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/recipes-extended/glusterfs/files/glusterd-change-port-range.patch b/recipes-extended/glusterfs/files/glusterd-change-port-range.patch index 0468460..884a5f0 100644 --- a/recipes-extended/glusterfs/files/glusterd-change-port-range.patch +++ b/recipes-extended/glusterfs/files/glusterd-change-port-range.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | glusterd: change port range | 1 | From 0102ca092047f51b936d39af966f19b23548c606 Mon Sep 17 00:00:00 2001 |
2 | From: Vu Tran <vu.tran@windriver.com> | ||
3 | Date: Wed, 26 Jul 2017 08:42:09 +0800 | ||
4 | Subject: [PATCH] glusterd: change port range | ||
2 | 5 | ||
3 | glusterfsd chooses tcp ports within the dynamic | 6 | glusterfsd chooses tcp ports within the dynamic |
4 | range [49152-65535] to provide its service. When | 7 | range [49152-65535] to provide its service. When |
@@ -19,6 +22,7 @@ Signed-off-by: Vu Tran <vu.tran@windriver.com> | |||
19 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 22 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
20 | [Yi: minor adjust to apply the patch on 3.11.1] | 23 | [Yi: minor adjust to apply the patch on 3.11.1] |
21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 24 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
25 | |||
22 | --- | 26 | --- |
23 | extras/glusterd.vol | 2 +- | 27 | extras/glusterd.vol | 2 +- |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 28 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -34,6 +38,3 @@ index d882007..c8dfe91 100644 | |||
34 | -# option base-port 49152 | 38 | -# option base-port 49152 |
35 | +# option base-port 59152 | 39 | +# option base-port 59152 |
36 | end-volume | 40 | end-volume |
37 | -- | ||
38 | 1.9.1 | ||
39 | |||
diff --git a/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch b/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch index 96d7352..5b54974 100644 --- a/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch +++ b/recipes-extended/glusterfs/files/glusterfs-api-remove-unnecessary-library-options.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a7e6549389f7358cad6a04544b2c1e4d2d5615d0 Mon Sep 17 00:00:00 2001 | 1 | From 61075d7e4459e4cb9168d1c423ac56db240bb463 Mon Sep 17 00:00:00 2001 |
2 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
3 | Date: Wed, 12 Feb 2014 15:41:50 +0000 | 3 | Date: Wed, 12 Feb 2014 15:41:50 +0000 |
4 | Subject: [PATCH] glusterfs-api remove unnecessary library options | 4 | Subject: [PATCH] glusterfs-api remove unnecessary library options |
@@ -11,6 +11,7 @@ Upstream-Status: Inappropriate [embedded specific] | |||
11 | 11 | ||
12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
14 | |||
14 | --- | 15 | --- |
15 | glusterfs-api.pc.in | 2 +- | 16 | glusterfs-api.pc.in | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -26,6 +27,3 @@ index 5d23454..8a602f6 100644 | |||
26 | -Libs: -L${libdir} @GFAPI_LIBS@ -lgfapi -lglusterfs -lgfrpc -lgfxdr | 27 | -Libs: -L${libdir} @GFAPI_LIBS@ -lgfapi -lglusterfs -lgfrpc -lgfxdr |
27 | +Libs: -lgfapi -lglusterfs -lgfrpc -lgfxdr | 28 | +Libs: -lgfapi -lglusterfs -lgfrpc -lgfxdr |
28 | Cflags: -I${includedir}/glusterfs -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -DUSE_POSIX_ACLS=@USE_POSIX_ACLS@ | 29 | Cflags: -I${includedir}/glusterfs -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -DUSE_POSIX_ACLS=@USE_POSIX_ACLS@ |
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch index 81439d1..874f7de 100644 --- a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch +++ b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | glusterfs: change default nfs port number | 1 | From 9fdaa80b4c933e8f0e97dfde2ba25ed4cea834d5 Mon Sep 17 00:00:00 2001 |
2 | From: Vu Tran <vu.tran@windriver.com> | ||
3 | Date: Wed, 26 Jul 2017 08:42:09 +0800 | ||
4 | Subject: [PATCH] glusterfs: change default nfs port number | ||
2 | 5 | ||
3 | Currently both native nfs and glusterfs-nfs use NFS well | 6 | Currently both native nfs and glusterfs-nfs use NFS well |
4 | known port 2049. This causes native nfs not to be able | 7 | known port 2049. This causes native nfs not to be able |
@@ -27,6 +30,7 @@ Signed-off-by: Vu Tran <vu.tran@windriver.com> | |||
27 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 30 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
28 | [Yi: minor adjust to apply the patch on 3.11.1] | 31 | [Yi: minor adjust to apply the patch on 3.11.1] |
29 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 32 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
33 | |||
30 | --- | 34 | --- |
31 | libglusterfs/src/common-utils.h | 2 +- | 35 | libglusterfs/src/common-utils.h | 2 +- |
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | 36 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -44,6 +48,3 @@ index 6bd2417..25a92b0 100644 | |||
44 | 48 | ||
45 | #define GF_CLIENT_PORT_CEILING 1024 | 49 | #define GF_CLIENT_PORT_CEILING 1024 |
46 | #define GF_IANA_PRIV_PORTS_START 49152 /* RFC 6335 */ | 50 | #define GF_IANA_PRIV_PORTS_START 49152 /* RFC 6335 */ |
47 | -- | ||
48 | 1.9.1 | ||
49 | |||
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 f385578..8f3c854 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,4 +1,4 @@ | |||
1 | From 32dffb85c81480d53e639ef84242ccfca26461f9 Mon Sep 17 00:00:00 2001 | 1 | From bb34fd21ae26005cf099928f41e68a0d98685eba Mon Sep 17 00:00:00 2001 |
2 | From: Xulin Sun <xulin.sun@windriver.com> | 2 | From: Xulin Sun <xulin.sun@windriver.com> |
3 | Date: Mon, 21 Mar 2016 17:32:50 +0800 | 3 | Date: Mon, 21 Mar 2016 17:32:50 +0800 |
4 | Subject: [PATCH] glusterfs: configure: automake with subdir-objects & foreign | 4 | Subject: [PATCH] glusterfs: configure: automake with subdir-objects & foreign |
@@ -10,12 +10,13 @@ autoconf execution failed when using automake 1.14 around version. | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 12 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | configure.ac | 4 ++-- | 15 | configure.ac | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 17 | ||
17 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
18 | index ff746ff..983572e 100644 | 19 | index 43efd6d..8ce28f6 100644 |
19 | --- a/configure.ac | 20 | --- a/configure.ac |
20 | +++ b/configure.ac | 21 | +++ b/configure.ac |
21 | @@ -13,11 +13,11 @@ AC_INIT([glusterfs], | 22 | @@ -13,11 +13,11 @@ AC_INIT([glusterfs], |
@@ -32,6 +33,3 @@ index ff746ff..983572e 100644 | |||
32 | 33 | ||
33 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) | 34 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) |
34 | 35 | ||
35 | -- | ||
36 | 1.9.1 | ||
37 | |||
diff --git a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch index cbff10e..dbc81b6 100644 --- a/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch +++ b/recipes-extended/glusterfs/files/glusterfs-disable-default-startup-scripts.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 08b55ee9ccb02db0519ddc9902025e191c1500b1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Donn Seeley <donn.seeley@windriver.com> | ||
3 | Date: Fri, 28 Feb 2014 09:11:02 -0500 | ||
4 | Subject: [PATCH] Add the glusterfs package | ||
5 | |||
1 | The glusterfs code for installing start-up scripts checks for systemd | 6 | The glusterfs code for installing start-up scripts checks for systemd |
2 | directories on the build host, and if it finds them, it chooses systemd | 7 | directories on the build host, and if it finds them, it chooses systemd |
3 | style scripts, otherwise init.d style scripts. This behavior might | 8 | style scripts, otherwise init.d style scripts. This behavior might |
@@ -13,6 +18,7 @@ Signed-off-by: Donn Seeley <donn.seeley@windriver.com> | |||
13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 18 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
14 | [Yi: minor adjust to apply the patch on 3.11.1] | 19 | [Yi: minor adjust to apply the patch on 3.11.1] |
15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
21 | |||
16 | --- | 22 | --- |
17 | extras/Makefile.am | 2 +- | 23 | extras/Makefile.am | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -30,6 +36,3 @@ index 3af1103..8978dde 100644 | |||
30 | $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils | 36 | $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils |
31 | 37 | ||
32 | confdir = $(sysconfdir)/glusterfs | 38 | confdir = $(sysconfdir)/glusterfs |
33 | -- | ||
34 | 1.9.1 | ||
35 | |||
diff --git a/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch b/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch index 97548a5..27b08a8 100644 --- a/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch +++ b/recipes-extended/glusterfs/files/libglusterfs-Don-t-link-against-libfl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c8be736bd972bb40b03a34bf9565e1bf4880fa7f Mon Sep 17 00:00:00 2001 | 1 | From d4109317c70c86a67464b7deebbe0c3de88773e1 Mon Sep 17 00:00:00 2001 |
2 | From: Xulin Sun <xulin.sun@windriver.com> | 2 | From: Xulin Sun <xulin.sun@windriver.com> |
3 | Date: Fri, 25 Mar 2016 12:33:04 +0800 | 3 | Date: Fri, 25 Mar 2016 12:33:04 +0800 |
4 | Subject: [PATCH] libglusterfs: Don't link against libfl | 4 | Subject: [PATCH] libglusterfs: Don't link against libfl |
@@ -11,16 +11,17 @@ undefined references to yylex. | |||
11 | Upstream-Status: Inappropriate [embedded specific] | 11 | Upstream-Status: Inappropriate [embedded specific] |
12 | 12 | ||
13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 13 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
14 | |||
14 | --- | 15 | --- |
15 | libglusterfs/src/Makefile.am | 2 +- | 16 | libglusterfs/src/Makefile.am | 2 +- |
16 | libglusterfs/src/graph.l | 1 + | 17 | libglusterfs/src/graph.l | 1 + |
17 | 2 files changed, 2 insertions(+), 1 deletion(-) | 18 | 2 files changed, 2 insertions(+), 1 deletion(-) |
18 | 19 | ||
19 | diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am | 20 | diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am |
20 | index 85886c1..e90f553 100644 | 21 | index 52b7316..ab5567a 100644 |
21 | --- a/libglusterfs/src/Makefile.am | 22 | --- a/libglusterfs/src/Makefile.am |
22 | +++ b/libglusterfs/src/Makefile.am | 23 | +++ b/libglusterfs/src/Makefile.am |
23 | @@ -8,7 +8,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ | 24 | @@ -11,7 +11,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ |
24 | -I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \ | 25 | -I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \ |
25 | -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel | 26 | -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel |
26 | 27 | ||
@@ -30,7 +31,7 @@ index 85886c1..e90f553 100644 | |||
30 | 31 | ||
31 | lib_LTLIBRARIES = libglusterfs.la | 32 | lib_LTLIBRARIES = libglusterfs.la |
32 | diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l | 33 | diff --git a/libglusterfs/src/graph.l b/libglusterfs/src/graph.l |
33 | index e4eba9c..78c6ef8 100644 | 34 | index 8af28a4..742d934 100644 |
34 | --- a/libglusterfs/src/graph.l | 35 | --- a/libglusterfs/src/graph.l |
35 | +++ b/libglusterfs/src/graph.l | 36 | +++ b/libglusterfs/src/graph.l |
36 | @@ -11,6 +11,7 @@ | 37 | @@ -11,6 +11,7 @@ |
@@ -41,6 +42,3 @@ index e4eba9c..78c6ef8 100644 | |||
41 | %{ | 42 | %{ |
42 | 43 | ||
43 | #define YYSTYPE char * | 44 | #define YYSTYPE char * |
44 | -- | ||
45 | 1.9.1 | ||
46 | |||
diff --git a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch index 9bb90d7..d70a103 100644 --- a/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch +++ b/recipes-extended/glusterfs/files/python-work-around-host-and-target-python.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 485cf109af4adf3050b558cf16c61b620d7b9fb0 Mon Sep 17 00:00:00 2001 | 1 | From fbe4fdfddb096e4e6650908929c366dcc9556ade Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 27 Feb 2014 21:50:40 -0500 | 3 | Date: Thu, 27 Feb 2014 21:50:40 -0500 |
4 | Subject: [PATCH] python: work around host and target python | 4 | Subject: [PATCH] python: work around host and target python |
@@ -18,6 +18,7 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
18 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> | 18 | Signed-off-by: Xulin Sun <xulin.sun@windriver.com> |
19 | [Yi: minor adjust the code to apply the patch on 3.11.1] | 19 | [Yi: minor adjust the code to apply the patch on 3.11.1] |
20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
21 | |||
21 | --- | 22 | --- |
22 | configure.ac | 2 ++ | 23 | configure.ac | 2 ++ |
23 | geo-replication/src/Makefile.am | 3 ++- | 24 | geo-replication/src/Makefile.am | 3 ++- |
@@ -25,7 +26,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
25 | 3 files changed, 7 insertions(+), 4 deletions(-) | 26 | 3 files changed, 7 insertions(+), 4 deletions(-) |
26 | 27 | ||
27 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
28 | index 7a31038..e54d92b 100644 | 29 | index 8ce28f6..8e0652a 100644 |
29 | --- a/configure.ac | 30 | --- a/configure.ac |
30 | +++ b/configure.ac | 31 | +++ b/configure.ac |
31 | @@ -270,6 +270,8 @@ AC_CANONICAL_HOST | 32 | @@ -270,6 +270,8 @@ AC_CANONICAL_HOST |
@@ -76,6 +77,3 @@ index 2c48ca5..b1d1126 100644 | |||
76 | strcmp (basename (buf + strlen (buf) + 1), GSYNCD_PY)) == 0) { | 77 | strcmp (basename (buf + strlen (buf) + 1), GSYNCD_PY)) == 0) { |
77 | ret = 1; | 78 | ret = 1; |
78 | break; | 79 | break; |
79 | -- | ||
80 | 1.9.1 | ||
81 | |||
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 7d26ecf..805c00a 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 @@ | |||
1 | From 79c943bba37cb10a462038ec56cd2b8045344951 Mon Sep 17 00:00:00 2001 | ||
2 | From: Donn Seeley <donn.seeley@windriver.com> | ||
3 | Date: Fri, 28 Feb 2014 09:11:02 -0500 | ||
4 | Subject: [PATCH] Add the glusterfs package | ||
5 | |||
1 | Three of the translator makefiles in glusterfs add unnecessary | 6 | Three of the translator makefiles in glusterfs add unnecessary |
2 | -L$(xlatordir) link options. This option causes the linker to check | 7 | -L$(xlatordir) link options. This option causes the linker to check |
3 | the host's $(xlatordir) directory, resulting in contamination that gets | 8 | the host's $(xlatordir) directory, resulting in contamination that gets |
@@ -8,6 +13,7 @@ Upstream-Status: Pending | |||
8 | Signed-off-by: Donn Seeley <donn.seeley@windriver.com> | 13 | Signed-off-by: Donn Seeley <donn.seeley@windriver.com> |
9 | [Xulin: minor adjust to apply the patch] | 14 | [Xulin: minor adjust to apply the patch] |
10 | Signed-off-by: Xuin Sun <xulin.sun@windriver.com> | 15 | Signed-off-by: Xuin Sun <xulin.sun@windriver.com> |
16 | |||
11 | --- | 17 | --- |
12 | xlators/mgmt/glusterd/src/Makefile.am | 2 +- | 18 | xlators/mgmt/glusterd/src/Makefile.am | 2 +- |
13 | xlators/nfs/server/src/Makefile.am | 2 -- | 19 | xlators/nfs/server/src/Makefile.am | 2 -- |
@@ -15,10 +21,10 @@ Signed-off-by: Xuin Sun <xulin.sun@windriver.com> | |||
15 | 3 files changed, 1 insertion(+), 5 deletions(-) | 21 | 3 files changed, 1 insertion(+), 5 deletions(-) |
16 | 22 | ||
17 | diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am | 23 | diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am |
18 | index a8f27fb..8243bf0 100644 | 24 | index b0f5a9b..0caad43 100644 |
19 | --- a/xlators/mgmt/glusterd/src/Makefile.am | 25 | --- a/xlators/mgmt/glusterd/src/Makefile.am |
20 | +++ b/xlators/mgmt/glusterd/src/Makefile.am | 26 | +++ b/xlators/mgmt/glusterd/src/Makefile.am |
21 | @@ -54,7 +54,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ | 27 | @@ -55,7 +55,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ |
22 | 28 | ||
23 | AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS) | 29 | AM_CFLAGS = -Wall $(GF_CFLAGS) $(URCU_CFLAGS) $(URCU_CDS_CFLAGS) |
24 | 30 | ||
@@ -28,21 +34,23 @@ index a8f27fb..8243bf0 100644 | |||
28 | CLEANFILES = | 34 | CLEANFILES = |
29 | 35 | ||
30 | diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am | 36 | diff --git a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am |
31 | index f91bbcf..b16bb9b 100644 | 37 | index bc6f8e9..56086a1 100644 |
32 | --- a/xlators/nfs/server/src/Makefile.am | 38 | --- a/xlators/nfs/server/src/Makefile.am |
33 | +++ b/xlators/nfs/server/src/Makefile.am | 39 | +++ b/xlators/nfs/server/src/Makefile.am |
34 | @@ -22,6 +22,4 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ | 40 | @@ -25,8 +25,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ |
35 | 41 | ||
36 | AM_CFLAGS = -Wall $(GF_CFLAGS) | 42 | AM_CFLAGS = -Wall $(GF_CFLAGS) |
37 | 43 | ||
38 | -AM_LDFLAGS = -L$(xlatordir) | 44 | -AM_LDFLAGS = -L$(xlatordir) |
39 | - | 45 | - |
40 | CLEANFILES = | 46 | CLEANFILES = |
47 | |||
48 | EXTRA_DIST = nfsserver.sym | ||
41 | diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am | 49 | diff --git a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am |
42 | index bc5fbc2..0b9fabe 100644 | 50 | index f57070c..70080a6 100644 |
43 | --- a/xlators/system/posix-acl/src/Makefile.am | 51 | --- a/xlators/system/posix-acl/src/Makefile.am |
44 | +++ b/xlators/system/posix-acl/src/Makefile.am | 52 | +++ b/xlators/system/posix-acl/src/Makefile.am |
45 | @@ -10,8 +10,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src | 53 | @@ -12,8 +12,6 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ |
46 | 54 | ||
47 | AM_CFLAGS = -Wall $(GF_CFLAGS) | 55 | AM_CFLAGS = -Wall $(GF_CFLAGS) |
48 | 56 | ||
@@ -51,6 +59,3 @@ index bc5fbc2..0b9fabe 100644 | |||
51 | CLEANFILES = | 59 | CLEANFILES = |
52 | 60 | ||
53 | access-control-compat: | 61 | access-control-compat: |
54 | -- | ||
55 | 1.9.1 | ||
56 | |||