Merge pull request #3162 from ansiwen/upgrade-gluster

Upgrade gluster client in ISO to 4.1.5

deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch

@@ -1,23 +0,0 @@
---- a/rpc/xdr/src/changelog-xdr.x	2018-04-24 19:55:36.000000000 +0530
-+++ b/rpc/xdr/src/changelog-xdr.x	2018-06-21 19:41:11.146680931 +0530
-@@ -27,16 +27,16 @@
- /* XDR: changelog -> libgfchangelog */
- struct changelog_event_req {
-        /* sequence number for the buffer */
--       unsigned long seq;
-+       unsigned int seq;
- 
-        /* time of dispatch */
--       unsigned long tv_sec;
--       unsigned long tv_usec;
-+       unsigned int tv_sec;
-+       unsigned int tv_usec;
- };
- 
- struct changelog_event_rsp {
-        int op_ret;
- 
-        /* ack'd buffers sequence number */
--       unsigned long seq;
-+       unsigned int seq;
- };

deploy/iso/minikube-iso/package/gluster/0002-use-gnu-rpcgen.patch

@@ -0,0 +1,42 @@
+diff -ru gluster-4.1.5/rpc/xdr/gen/Makefile.am gluster-4.1.5.patched/rpc/xdr/gen/Makefile.am
+--- gluster-4.1.5/rpc/xdr/gen/Makefile.am	2018-09-21 16:13:45.958611272 +0200
++++ gluster-4.1.5.patched/rpc/xdr/gen/Makefile.am	2018-09-24 19:50:32.798967652 +0200
+@@ -19,14 +19,14 @@
+ # in the build. Or we do this crufty thing instead.
+ $(XDRSOURCES): $(XDRGENFILES)
+ 	@if [ ! -e $(xdrdst)/$@ -o $(@:.c=.x) -nt $(xdrdst)/$@ ]; then \
+-		rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\
++		/usr/bin/rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\
+ 	fi
+ 
+ # d*mn sed in netbsd6 doesn't do -i (inline)
+ # (why are we still running smoke on netbsd6 and not netbsd7?)
+ $(XDRHEADERS): $(XDRGENFILES)
+ 	@if [ ! -e $(xdrdst)/$@ -o $(@:.h=.x) -nt $(xdrdst)/$@ ]; then \
+-		rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \
++		/usr/bin/rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \
+ 		sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' \
+ 			-e '/#endif/ s/-/_/' -e 's/TMP_/H_/g' \
+ 			$(@:.h=.tmp) > $(xdrdst)/$@ && \
+Only in gluster-4.1.5.patched/rpc/xdr/gen: Makefile.am~
+diff -ru gluster-4.1.5/rpc/xdr/gen/Makefile.in gluster-4.1.5.patched/rpc/xdr/gen/Makefile.in
+--- gluster-4.1.5/rpc/xdr/gen/Makefile.in	2018-09-21 16:13:56.087638030 +0200
++++ gluster-4.1.5.patched/rpc/xdr/gen/Makefile.in	2018-09-24 19:51:06.198109046 +0200
+@@ -558,14 +558,14 @@
+ # in the build. Or we do this crufty thing instead.
+ $(XDRSOURCES): $(XDRGENFILES)
+ 	@if [ ! -e $(xdrdst)/$@ -o $(@:.c=.x) -nt $(xdrdst)/$@ ]; then \
+-		rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\
++		/usr/bin/rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\
+ 	fi
+ 
+ # d*mn sed in netbsd6 doesn't do -i (inline)
+ # (why are we still running smoke on netbsd6 and not netbsd7?)
+ $(XDRHEADERS): $(XDRGENFILES)
+ 	@if [ ! -e $(xdrdst)/$@ -o $(@:.h=.x) -nt $(xdrdst)/$@ ]; then \
+-		rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \
++		/usr/bin/rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \
+ 		sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' \
+ 			-e '/#endif/ s/-/_/' -e 's/TMP_/H_/g' \
+ 			$(@:.h=.tmp) > $(xdrdst)/$@ && \
+Only in gluster-4.1.5.patched/rpc/xdr/gen: Makefile.in~

deploy/iso/minikube-iso/package/gluster/gluster.hash

@@ -1 +1 @@
-sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz
+sha512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f  glusterfs-4.1.5.tar.gz

deploy/iso/minikube-iso/package/gluster/gluster.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GLUSTER_VERSION = 3.10.12
+GLUSTER_VERSION = 4.1.5
-GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/3.10/$(GLUSTER_VERSION)
+GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/4.1/$(GLUSTER_VERSION)
 GLUSTER_SOURCE = glusterfs-$(GLUSTER_VERSION).tar.gz
-GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs
+GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs --disable-glupy --disable-gnfs --disable-cmocka --without-server
 GLUSTER_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
 $(eval $(autotools-package))