obs/generic/: Support fluentbit-plugin-wendelin as a separate tarball. Fix...

obs/generic/: Support fluentbit-plugin-wendelin as a separate tarball. Fix some bugs and update files.

obs/generic/templates/compilation-templates/mca/Makefile.in: Support fluentbit-plugin-wendelin as a separate tarball.

obs/generic/: Fix some bugs. Update files.

build-scripts/clean_build_tree.sh: Fix failure when $RUN_BUILDOUT_DIR/go did not exist.
build-scripts/bootstrap_buildout.sh: Fix a bug in the backup mechanism.
templates/:
- Fix mca/Makefile.in
- Change debian_defaults/dirs.in to fit the mca case.

obs/generic/build-scripts/bootstrap_buildout.sh

@@ -29,4 +29,4 @@ BACKUP_DIR=$TARBALL_DIR/../backup.$SOFTWARE_AND_VERSION
 BACKUP_DIR=`realpath -m $BACKUP_DIR`
 # Delete the potential old backup and backup the newly created build tree instead.
 rm -rf $BACKUP_DIR
-cp -r $TARBAL_DIR $BACKUP_DIR
+cp -r $TARBALL_DIR $BACKUP_DIR

obs/generic/build-scripts/clean_build_tree.sh

@@ -5,9 +5,11 @@ source build-scripts/configuration_information.sh
 
 cd $INITIAL_DIR
 # For some reason the user does not have the "write" permission on some directories of go/. As it is
-# needed on a directory to delete a file in it, the following line add the permissions to every
+# needed on a directory to delete a file in it, the if block add the permissions to every
 # directories in go/.
-find $RUN_BUILDOUT_DIR/go -name "*" -type d -exec chmod u+xw {} +
+if [ -d $RUN_BUILDOUT_DIR/go ]; then
+	find $RUN_BUILDOUT_DIR/go -name "*" -type d -exec chmod u+xw {} +
+fi
 rm -rf $TARBALL_DIR
 
 exit # TODO: separate the tree building from the software release retrieving

obs/generic/templates/compilation-templates/mca/Makefile.in

@@ -48,11 +48,21 @@ install: all
 	mkdir -p $(INSTALL_DIR)/etc/
 	mkdir -p $(INSTALL_DIR)/lib/
 	mkdir -p $(INSTALL_DIR)/share/
+	mkdir -p $(INSTALL_DIR)/include/
 	#cp `find $(RUN_BUILDOUT_DIR) | grep -e "^$(RUN_BUILDOUT_DIR)/[^/][^/]*/bin/*` $(DESTDIR)/usr/bin/
-	-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/bin/* $(INSTALL_DIR)/bin/
+	# no -r because there must be no subdirectories
+	# see https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s04.html
+	# and https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html
+	-cp $(RUN_BUILDOUT_DIR)/parts/mca/bin/* $(INSTALL_DIR)/bin/
 	-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/etc/* $(INSTALL_DIR)/etc/
-	-cp -r $(RUN_BUILDOUT_DIR)/parts/{mca,openssl}/lib/* $(INSTALL_DIR)/lib/
-	-cp -r $(RUN_BUILDOUT_DIR)/parts/{mca,openssl}/share/* $(INSTALL_DIR)/share/
+	-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/lib/* $(INSTALL_DIR)/lib/
+	# TODO: the next "cp" line is temporary renaming the library and this should be fixed asap
+	# the fix has to be made primarily in the MCA project
+	-cp $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/lib/libfluentbit_wendelin.so $(INSTALL_DIR)/lib/fluentbit_wendelin.so
+	-cp $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/include/libfluentbit_wendelin.h $(INSTALL_DIR)/include/libfluentbit_wendelin.h
+	-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/share/* $(INSTALL_DIR)/share/
+	-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/share/* $(INSTALL_DIR)/share/
+	-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/share/* $(INSTALL_DIR)/share/
 	ls -Rl $(INSTALL_DIR)/bin/ # DEBUG
 
 .PHONY: build all clean install

obs/generic/templates/distribution-templates/debian_default/dirs.in

 /opt/%SOFTWARE_AND_VERSION%/bin/
-/opt/%SOFTWARE_AND_VERSION%/lib/
+/opt/%SOFTWARE_AND_VERSION%/include/
 /opt/%SOFTWARE_AND_VERSION%/etc/
+/opt/%SOFTWARE_AND_VERSION%/lib/
+/opt/%SOFTWARE_AND_VERSION%/share/