Skip to content

Commit 9b57950

Browse files
ansiwendlorenc
ansiwen
authored and
dlorenc
committed
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.
1 parent db90809 commit 9b57950

File tree

8 files changed

+134
-0
lines changed

8 files changed

+134
-0
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ CONFIG_PATA_SCH=y
302302
CONFIG_MD=y
303303
CONFIG_BLK_DEV_MD=y
304304
CONFIG_BLK_DEV_DM=y
305+
CONFIG_DM_SNAPSHOT=y
306+
CONFIG_DM_THIN_PROVISIONING=y
305307
CONFIG_DM_MIRROR=y
306308
CONFIG_DM_ZERO=y
307309
CONFIG_FUSION=y
@@ -420,6 +422,8 @@ CONFIG_EFI_VARS=y
420422
CONFIG_EXT4_FS=y
421423
CONFIG_EXT4_FS_POSIX_ACL=y
422424
CONFIG_EXT4_FS_SECURITY=y
425+
CONFIG_XFS_FS=y
426+
CONFIG_XFS_POSIX_ACL=y
423427
CONFIG_BTRFS_FS=m
424428
CONFIG_BTRFS_FS_POSIX_ACL=y
425429
CONFIG_QUOTA=y

‎deploy/iso/minikube-iso/configs/minikube_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ BR2_PACKAGE_SYSTEMD_LOGIND=y
5050
BR2_PACKAGE_SYSTEMD_MACHINED=y
5151
BR2_PACKAGE_SYSTEMD_VCONSOLE=y
5252
BR2_PACKAGE_UTIL_LINUX_NSENTER=y
53+
BR2_PACKAGE_XFSPROGS=y
5354
BR2_TARGET_ROOTFS_CPIO_BZIP2=y
5455
BR2_TARGET_ROOTFS_ISO9660=y
5556
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ menu "System tools"
99
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in"
1010
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-bin/Config.in"
1111
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-kvp-daemon/Config.in"
12+
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
1213
endmenu

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

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
--- a/configure 2018-04-24 16:25:41.000000000 +0200
2+
+++ b/configure 2018-06-01 19:55:45.043559397 +0200
3+
@@ -15420,76 +15420,7 @@
4+
5+
# Check the distribution where you are compiling glusterfs on
6+
7+
-GF_DISTRIBUTION=
8+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5
9+
-$as_echo_n "checking for /etc/debian_version... " >&6; }
10+
-if ${ac_cv_file__etc_debian_version+:} false; then :
11+
- $as_echo_n "(cached) " >&6
12+
-else
13+
- test "$cross_compiling" = yes &&
14+
- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
15+
-if test -r "/etc/debian_version"; then
16+
- ac_cv_file__etc_debian_version=yes
17+
-else
18+
- ac_cv_file__etc_debian_version=no
19+
-fi
20+
-fi
21+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5
22+
-$as_echo "$ac_cv_file__etc_debian_version" >&6; }
23+
-if test "x$ac_cv_file__etc_debian_version" = xyes; then :
24+
-
25+
-fi
26+
-
27+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5
28+
-$as_echo_n "checking for /etc/SuSE-release... " >&6; }
29+
-if ${ac_cv_file__etc_SuSE_release+:} false; then :
30+
- $as_echo_n "(cached) " >&6
31+
-else
32+
- test "$cross_compiling" = yes &&
33+
- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
34+
-if test -r "/etc/SuSE-release"; then
35+
- ac_cv_file__etc_SuSE_release=yes
36+
-else
37+
- ac_cv_file__etc_SuSE_release=no
38+
-fi
39+
-fi
40+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5
41+
-$as_echo "$ac_cv_file__etc_SuSE_release" >&6; }
42+
-if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
43+
-
44+
-fi
45+
-
46+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5
47+
-$as_echo_n "checking for /etc/redhat-release... " >&6; }
48+
-if ${ac_cv_file__etc_redhat_release+:} false; then :
49+
- $as_echo_n "(cached) " >&6
50+
-else
51+
- test "$cross_compiling" = yes &&
52+
- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
53+
-if test -r "/etc/redhat-release"; then
54+
- ac_cv_file__etc_redhat_release=yes
55+
-else
56+
- ac_cv_file__etc_redhat_release=no
57+
-fi
58+
-fi
59+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5
60+
-$as_echo "$ac_cv_file__etc_redhat_release" >&6; }
61+
-if test "x$ac_cv_file__etc_redhat_release" = xyes; then :
62+
-
63+
-fi
64+
-
65+
-
66+
-if test "x$ac_cv_file__etc_debian_version" = "xyes"; then
67+
- GF_DISTRIBUTION=Debian
68+
-fi
69+
-if test "x$ac_cv_file__etc_SuSE_release" = "xyes"; then
70+
- GF_DISTRIBUTION=SuSE
71+
-fi
72+
-if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
73+
- GF_DISTRIBUTION=Redhat
74+
-fi
75+
-
76+
-
77+
+GF_DISTRIBUTION=Redhat
78+
79+
GF_HOST_OS=""
80+
GF_LDFLAGS="-rdynamic"

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

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--- a/rpc/xdr/src/changelog-xdr.x 2018-04-24 19:55:36.000000000 +0530
2+
+++ b/rpc/xdr/src/changelog-xdr.x 2018-06-21 19:41:11.146680931 +0530
3+
@@ -27,16 +27,16 @@
4+
/* XDR: changelog -> libgfchangelog */
5+
struct changelog_event_req {
6+
/* sequence number for the buffer */
7+
- unsigned long seq;
8+
+ unsigned int seq;
9+
10+
/* time of dispatch */
11+
- unsigned long tv_sec;
12+
- unsigned long tv_usec;
13+
+ unsigned int tv_sec;
14+
+ unsigned int tv_usec;
15+
};
16+
17+
struct changelog_event_rsp {
18+
int op_ret;
19+
20+
/* ack'd buffers sequence number */
21+
- unsigned long seq;
22+
+ unsigned int seq;
23+
};

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config BR2_PACKAGE_GLUSTER
2+
bool "gluster"
3+
default y
4+
depends on BR2_x86_64
5+
select BR2_PACKAGE_LIBURCU
6+
select BR2_PACKAGE_LIBXML2
7+
help
8+
Gluster is a scalable, distributed file system that
9+
aggregates disk storage resources from multiple servers into
10+
a single global namespace.
11+
12+
https://www.gluster.org/

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
################################################################################
2+
#
3+
# gluster
4+
#
5+
################################################################################
6+
7+
GLUSTER_VERSION = 3.10.12
8+
GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/3.10/$(GLUSTER_VERSION)
9+
GLUSTER_SOURCE = glusterfs-$(GLUSTER_VERSION).tar.gz
10+
GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs
11+
GLUSTER_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
12+
$(eval $(autotools-package))

0 commit comments

Comments
 (0)