-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add heketi and gluster dependencies to minikube.iso
This change adds gluster and heketi dependencies to buildroot config, that is dm_snapshot, dm_thin_pool and XFS kernel modules, XFS tools, and gluster itself.
- Loading branch information
Showing
8 changed files
with
134 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
deploy/iso/minikube-iso/package/gluster/0001-set-distribution.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
23 changes: 23 additions & 0 deletions
23
deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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)) |