Commit ab6a84d7 authored by Ophélie Gagnard's avatar Ophélie Gagnard

light-build-dependencies-mca:

template/compilation-templates/light-build-dependencies-mca/: Update Makefile.in
- Don't rename libfluentbit_wendelin.so into fluentbit_wendelin.so
- Don't copy include/
- Some more tweaks.

distribution-specifics/light-build-dependencies-mca/debian: Update dirs accordingly.
parent 65232635
/opt/light-build-dependencies-mca_1-1/bin/ /opt/light-build-dependencies-mca_1-1/bin/
/opt/light-build-dependencies-mca_1-1/include/
/opt/light-build-dependencies-mca_1-1/etc/ /opt/light-build-dependencies-mca_1-1/etc/
/opt/light-build-dependencies-mca_1-1/lib/ /opt/light-build-dependencies-mca_1-1/lib/
/opt/light-build-dependencies-mca_1-1/share/ /opt/light-build-dependencies-mca_1-1/share/
...@@ -46,7 +46,7 @@ install: all ...@@ -46,7 +46,7 @@ install: all
# mkdir # mkdir
mkdir -p $(INSTALL_DIR)/bin mkdir -p $(INSTALL_DIR)/bin
mkdir -p $(INSTALL_DIR)/etc/ mkdir -p $(INSTALL_DIR)/etc/
mkdir -p $(INSTALL_DIR)/include/ #mkdir -p $(INSTALL_DIR)/include/
mkdir -p $(INSTALL_DIR)/lib/ mkdir -p $(INSTALL_DIR)/lib/
mkdir -p $(INSTALL_DIR)/share/ mkdir -p $(INSTALL_DIR)/share/
...@@ -62,38 +62,37 @@ install: all ...@@ -62,38 +62,37 @@ install: all
# etc # etc
-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/etc/* $(INSTALL_DIR)/etc/ -cp -r $(RUN_BUILDOUT_DIR)/parts/mca/etc/* $(INSTALL_DIR)/etc/
# next line: in case flb.conf is moved to from mca to fluentbit-plugin-wendelin
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/etc/* $(INSTALL_DIR)/etc/
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/etc/* $(INSTALL_DIR)/etc/ -cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/etc/* $(INSTALL_DIR)/etc/
# remove links to certs in parts/ca-certificates/[...]: not supported for now # remove links to certs in parts/ca-certificates/[...]: not supported for now
-rm -rf $(INSTALL_DIR)/etc/ssl/certs -rm -rf $(INSTALL_DIR)/etc/ssl/certs
# include # include
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/include/* $(INSTALL_DIR)/include/ #-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/include/* $(INSTALL_DIR)/include/
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/include/* $(INSTALL_DIR)/include/ #-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/include/* $(INSTALL_DIR)/include/
# lib # lib
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/lib/* $(INSTALL_DIR)/lib/ -cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/lib/libcrypto* $(INSTALL_DIR)/lib/
# TODO: the next "cp" line is temporary renaming the library and this should be fixed asap -cp $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/lib/* $(INSTALL_DIR)/lib/
# 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
# LIBCRYPTO # LIBCRYPTO
# TODO: then next "cp" is a workaroung because libcrypto.so or libcrypto.a from slapos doesn't work # TODO: then next "cp" is a workaroung because libcrypto.so or libcrypto.a from slapos doesn't work
# this should be fixed asap # this should be fixed asap
-cp /lib/x86_64-linux-gnu/libcrypto.so.1.1 $(INSTALL_DIR)/lib/ #-cp /lib/x86_64-linux-gnu/libcrypto.so.1.1 $(INSTALL_DIR)/lib/
# LIBFMT # LIBFMT
# TODO: use a static library instead -cp -r $(RUN_BUILDOUT_DIR)/parts/fmtlib/lib/libfmt.so* $(INSTALL_DIR)/lib/
# the fix has to be made primarily in the MCA project
-cp -r $(RUN_BUILDOUT_DIR)/parts/fmtlib/lib/* $(INSTALL_DIR)/lib/
# share # share
-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/share/* $(INSTALL_DIR)/share/ -cp -r $(RUN_BUILDOUT_DIR)/parts/mca/share/* $(INSTALL_DIR)/share/
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/share/* $(INSTALL_DIR)/share/ # TODO: what is it actually needed from openssl...?
#-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/share/* $(INSTALL_DIR)/share/
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/share/* $(INSTALL_DIR)/share/ -cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/share/* $(INSTALL_DIR)/share/
# DEBUG # DEBUG
ls -Rl $(INSTALL_DIR)/bin/ # DEBUG ls -Rl $(INSTALL_DIR)/bin/ # DEBUG
ls -Rl $(INSTALL_DIR)/etc/ # DEBUG ls -Rl $(INSTALL_DIR)/etc/ # DEBUG
ls -Rl $(INSTALL_DIR)/include/ # DEBUG #ls -Rl $(INSTALL_DIR)/include/ # DEBUG
ls -Rl $(INSTALL_DIR)/lib/ # DEBUG ls -Rl $(INSTALL_DIR)/lib/ # DEBUG
ls -Rl $(INSTALL_DIR)/share/ # DEBUG ls -Rl $(INSTALL_DIR)/share/ # DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment