Merge branch 'LiXi-storage:main' into main

.gitignore

@@ -10,10 +10,11 @@
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
 
-Makefile.in
 aclocal.m4
 autom4te.cache
 barrele.spec
+clownf.spec
+clownfish_simplified.tmp.toml
 compile
 config.guess
 config.h
@@ -32,6 +33,7 @@ libltdl
 libtool
 ltmain.sh
 missing
+Makefile.in
 nohup.out
 stamp-h1
 .deps

Makefile.am

@@ -1,13 +1,18 @@
-SUBDIRS = pybuild
-DIST_SUBDIRS = pybuild
+SUBDIRS = pybuild \
+	@CCLOWNF_SUBDIR@ \
+	@GOCORAL_SUBDIR@
+DIST_SUBDIRS = pybuild \
+	cclownf \
+	ccoral \
+	gocoral
 
 if ENABLE_BARRELE
 SUBDIRS += barreleye
 endif #ENABLE_BARRELE
+
 SUBDIRS += pycheck bash_completion .
 DIST_SUBDIRS += barreleye pycheck bash_completion .
 
-
 build_dir = `pwd`/build
 rpmbuild_opt =
 ISO_PATH = `pwd`/ISO
@@ -22,6 +27,7 @@ ACLOCAL_AMFLAGS = ${ALOCAL_FLAGS}
 
 PYTHON_COMMANDS = \
 	barrele \
+	clownf \
 	coral
 
 EXTRA_DIST = \
@@ -31,9 +37,14 @@ EXTRA_DIST = \
 	detect-distro.sh \
 	doc \
 	example_configs/barreleye.conf.example \
+	example_configs/clownfish.conf.example \
+	gocoral/* \
+	man/* \
 	pybarrele/*.py \
 	pybuild/*.py \
+	pyclownf/*.py \
 	pycoral/*.py \
+	systemd/* \
 	version
 
 doc.checked: pybuild/build_doc.py
@@ -74,6 +85,13 @@ else
 rpmbuild_opt += --without barrele
 endif
 
+if ENABLE_CLOWNF
+rpmbuild_opt += --with clownf
+CORAL_PACKAGES += clownfish
+else
+rpmbuild_opt += --without clownf
+endif
+
 
 EXES =
 PYINSTALLER_CMD=PYTHONPATH=$(PIP3_PACKAGE_PATH) pyinstaller -F --clean
@@ -86,6 +104,13 @@ dist/barrele:
 	$(PYINSTALLER_CMD) barrele
 endif
 
+if ENABLE_CLOWNF
+EXES += clownf
+dist/clownf:
+	mkdir -p dist
+	$(PYINSTALLER_CMD) clownf
+endif
+
 
 EXE_BINS = @DOLLAR@(addprefix dist/, $(EXES))
 

bash_completion/.gitignore

@@ -1,2 +1,3 @@
 /barrele
+/clownf
 /Makefile

bash_completion/Makefile.am

@@ -9,6 +9,14 @@ barrele:
 	mv barrele.tmp barrele
 endif
 
+if ENABLE_CLOWNF
+COMPLETIONS += clownf
+clownf:
+	PYTHONPATH=$(PIP3_PACKAGE_PATH) ../clownf -- --completion > clownf.tmp || exit 1; \
+	mv clownf.tmp clownf
+endif
+
+
 clean-local:
 	rm -f $(COMPLETIONS)
 

cclownf/Makefile.am

@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS = -Wall foreign
+ACLOCAL_AMFLAGS = ${ALOCAL_FLAGS}
+if ENABLE_CLOWNF
+noinst_PROGRAMS = clownf_storage
+endif #ENABLE_CLOWNF
+
+CLF_CFLAGS_ = -Wall -Werror -g -lssl -lcrypto
+CLF_LDFLAGS_ =
+
+if ZFS
+CLF_CFLAGS_ += $(zfs_CFLAGS)
+CLF_LDFLAGS_ += -lzfs -lzpool -lnvpair
+endif
+
+clownf_storage_SOURCES = clownf_storage.c \
+	../ccoral/debug.h \
+	../ccoral/debug.c
+nodist_clownf_storage_SOURCES = clf_constant.h
+clownf_storage_CFLAGS = $(CLF_CFLAGS_)
+clownf_storage_LDFLAGS = $(CLF_LDFLAGS_)
+CHECKS =
+
+
+clean-local:
+	rm -f $(CHECKS)
+
+all: all-am $(CHECKS)