Add heketi and gluster dependencies to minikube.iso

deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig

@@ -302,6 +302,8 @@ CONFIG_PATA_SCH=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_DM=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_THIN_PROVISIONING=y
 CONFIG_DM_MIRROR=y
 CONFIG_DM_ZERO=y
 CONFIG_FUSION=y
@@ -420,6 +422,8 @@ CONFIG_EFI_VARS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_QUOTA=y

deploy/iso/minikube-iso/configs/minikube_defconfig

@@ -50,6 +50,7 @@ BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_SYSTEMD_MACHINED=y
 BR2_PACKAGE_SYSTEMD_VCONSOLE=y
 BR2_PACKAGE_UTIL_LINUX_NSENTER=y
+BR2_PACKAGE_XFSPROGS=y
 BR2_TARGET_ROOTFS_CPIO_BZIP2=y
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"

deploy/iso/minikube-iso/package/Config.in

@@ -9,4 +9,5 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-kvp-daemon/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
 endmenu

deploy/iso/minikube-iso/package/gluster/0001-set-distribution.patch

@@ -0,0 +1,80 @@
+--- a/configure	2018-04-24 16:25:41.000000000 +0200
++++ b/configure	2018-06-01 19:55:45.043559397 +0200
+@@ -15420,76 +15420,7 @@
+
+ # Check the distribution where you are compiling glusterfs on
+
+-GF_DISTRIBUTION=
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5
+-$as_echo_n "checking for /etc/debian_version... " >&6; }
+-if ${ac_cv_file__etc_debian_version+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "/etc/debian_version"; then
+-  ac_cv_file__etc_debian_version=yes
+-else
+-  ac_cv_file__etc_debian_version=no
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5
+-$as_echo "$ac_cv_file__etc_debian_version" >&6; }
+-if test "x$ac_cv_file__etc_debian_version" = xyes; then :
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
+-$as_echo_n "checking for /etc/SuSE-release... " >&6; }
+-if ${ac_cv_file__etc_SuSE_release+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "/etc/SuSE-release"; then
+-  ac_cv_file__etc_SuSE_release=yes
+-else
+-  ac_cv_file__etc_SuSE_release=no
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5
+-$as_echo "$ac_cv_file__etc_SuSE_release" >&6; }
+-if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5
+-$as_echo_n "checking for /etc/redhat-release... " >&6; }
+-if ${ac_cv_file__etc_redhat_release+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+-if test -r "/etc/redhat-release"; then
+-  ac_cv_file__etc_redhat_release=yes
+-else
+-  ac_cv_file__etc_redhat_release=no
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5
+-$as_echo "$ac_cv_file__etc_redhat_release" >&6; }
+-if test "x$ac_cv_file__etc_redhat_release" = xyes; then :
+-
+-fi
+-
+-
+-if test "x$ac_cv_file__etc_debian_version" = "xyes"; then
+-   GF_DISTRIBUTION=Debian
+-fi
+-if test "x$ac_cv_file__etc_SuSE_release" = "xyes"; then
+-   GF_DISTRIBUTION=SuSE
+-fi
+-if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
+-   GF_DISTRIBUTION=Redhat
+-fi
+-
+-
++GF_DISTRIBUTION=Redhat
+
+ GF_HOST_OS=""
+ GF_LDFLAGS="-rdynamic"

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

@@ -0,0 +1,23 @@
+--- 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/Config.in

@@ -0,0 +1,12 @@
+config BR2_PACKAGE_GLUSTER
+	bool "gluster"
+	default y
+	depends on BR2_x86_64
+	select BR2_PACKAGE_LIBURCU
+	select BR2_PACKAGE_LIBXML2
+	help
+	  Gluster is a scalable, distributed file system that
+	  aggregates disk storage resources from multiple servers into
+	  a single global namespace.
+
+	  https://www.gluster.org/

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

@@ -0,0 +1 @@
+sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz

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

@@ -0,0 +1,12 @@
+################################################################################
+#
+# gluster
+#
+################################################################################
+
+GLUSTER_VERSION = 3.10.12
+GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/3.10/$(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_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
+$(eval $(autotools-package))