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

Makefile: Remove fluent-bit installation, and every reference to it.

parent edf90729
...@@ -16,18 +16,6 @@ bin/metadata-collect-agent: ...@@ -16,18 +16,6 @@ bin/metadata-collect-agent:
make make
install -m 744 build/metadata-collect-agent/metadata-collect-agent bin/ install -m 744 build/metadata-collect-agent/metadata-collect-agent bin/
bin/fluent-bit:
install -d bin/
cp /bin/fluent-bit bin/fluent-bit
#install -d bin/ ;\
mkdir -p build/ ;\
cp installation/fluentbit-install.sh build/fluentbit-install.sh ;\
cd build/ ;\
./fluentbit-install.sh ;\
cd .. ;\
install -m 744 build/fluent-bit/build/bin/fluent-bit bin/
lib/fluentbit_wendelin.so: lib/fluentbit_wendelin.so:
install -d lib/ ;\ install -d lib/ ;\
mkdir -p build/ ;\ mkdir -p build/ ;\
...@@ -43,7 +31,6 @@ lib/fluentbit_wendelin.so: ...@@ -43,7 +31,6 @@ lib/fluentbit_wendelin.so:
install-no-dracut: install-no-dracut:
install -d $(DESTDIR)$(PREFIX)/bin/ install -d $(DESTDIR)$(PREFIX)/bin/
install -m 744 bin/metadata-collect-agent $(DESTDIR)$(PREFIX)/bin/metadata-collect-agent install -m 744 bin/metadata-collect-agent $(DESTDIR)$(PREFIX)/bin/metadata-collect-agent
install -m 744 bin/fluent-bit $(DESTDIR)$(PREFIX)/bin/fluent-bit
install -d $(DESTDIR)$(PREFIX)/etc/ install -d $(DESTDIR)$(PREFIX)/etc/
install -m 644 flb.conf $(DESTDIR)$(PREFIX)/etc/flb.conf install -m 644 flb.conf $(DESTDIR)$(PREFIX)/etc/flb.conf
install -d $(DESTDIR)$(PREFIX)/lib install -d $(DESTDIR)$(PREFIX)/lib
...@@ -51,11 +38,10 @@ install-no-dracut: ...@@ -51,11 +38,10 @@ install-no-dracut:
uninstall-no-dracut: uninstall-no-dracut:
rm -rf $(DESTDIR)$(PREFIX)/bin/metadata-collect-agent rm -rf $(DESTDIR)$(PREFIX)/bin/metadata-collect-agent
rm -rf $(DESTDIR)$(PREFIX)/bin/fluent-bit
rm -rf $(DESTDIT)$(PREFIX)/etc/flb.conf rm -rf $(DESTDIT)$(PREFIX)/etc/flb.conf
rm -rf $(DESTDIR)$(PREFIX)/lib/fluentbit_wendelin.so rm -rf $(DESTDIR)$(PREFIX)/lib/fluentbit_wendelin.so
no-dracut: bin/metadata-collect-agent lib/fluentbit_wendelin.so bin/fluent-bit no-dracut: bin/metadata-collect-agent lib/fluentbit_wendelin.so
clean-no-dracut-local: clean-no-dracut-local:
rm -rf build/ rm -rf build/
...@@ -73,10 +59,8 @@ dracut.module/90metadata-collect/metadata-collect-agent: bin/metadata-collect-ag ...@@ -73,10 +59,8 @@ dracut.module/90metadata-collect/metadata-collect-agent: bin/metadata-collect-ag
install -m 744 bin/metadata-collect-agent dracut.module/90metadata-collect/metadata-collect-agent install -m 744 bin/metadata-collect-agent dracut.module/90metadata-collect/metadata-collect-agent
dracut.module/90metadata-collect/fluentbit_wendelin.so: lib/fluentbit_wendelin.so dracut.module/90metadata-collect/fluentbit_wendelin.so: lib/fluentbit_wendelin.so
install -m 644 lib/fluentbit_wendelin.so dracut.module/90metadata-collect/fluentbit_wendelin.so install -m 644 lib/fluentbit_wendelin.so dracut.module/90metadata-collect/fluentbit_wendelin.so
dracut.module/90metadata-collect/fluent-bit: bin/fluent-bit
install -m 744 bin/fluent-bit dracut.module/90metadata-collect/fluent-bit
dracut-module: dracut.module/90metadata-collect/collect.sh dracut.module/90metadata-collect/flb.conf dracut.module/90metadata-collect/metadata-collect-agent dracut.module/90metadata-collect/fluentbit_wendelin.so dracut.module/90metadata-collect/fluent-bit dracut-module: dracut.module/90metadata-collect/collect.sh dracut.module/90metadata-collect/flb.conf dracut.module/90metadata-collect/metadata-collect-agent dracut.module/90metadata-collect/fluentbit_wendelin.so
install-dracut-module: install-dracut-module:
sudo install -d /usr/lib/dracut/module.d/90metadata-collect sudo install -d /usr/lib/dracut/module.d/90metadata-collect
...@@ -84,14 +68,12 @@ install-dracut-module: ...@@ -84,14 +68,12 @@ install-dracut-module:
sudo install -m 644 dracut.module/90metadata-collect/flb.conf /usr/lib/dracut/module.d/90metadata-collect/ sudo install -m 644 dracut.module/90metadata-collect/flb.conf /usr/lib/dracut/module.d/90metadata-collect/
sudo install -m 744 dracut.module/90metadata-collect/metadata-collect-agent /usr/lib/dracut/module.d/90metadata-collect/ sudo install -m 744 dracut.module/90metadata-collect/metadata-collect-agent /usr/lib/dracut/module.d/90metadata-collect/
sudo install -m 644 dracut.module/90metadata-collect/fluentbit_wendelin.so /usr/lib/dracut/module.d/90metadata-collect/ sudo install -m 644 dracut.module/90metadata-collect/fluentbit_wendelin.so /usr/lib/dracut/module.d/90metadata-collect/
sudo install -m 744 dracut.module/90metadata-collect/fluent-bit /usr/lib/dracut/module.d/90metadata-collect/
uninstall-dracut-module: uninstall-dracut-module:
rm -f dracut.module/90metadata-collect/collect.sh rm -f dracut.module/90metadata-collect/collect.sh
rm -f dracut.module/90metadata-collect/flb.conf rm -f dracut.module/90metadata-collect/flb.conf
rm -f dracut.module/90metadata-collect/metadata-collect-agent rm -f dracut.module/90metadata-collect/metadata-collect-agent
rm -f dracut.module/90metadata-collect/fluentbit_wendelin.so rm -f dracut.module/90metadata-collect/fluentbit_wendelin.so
rm -f dracut.module/90metadata-collect/fluent-bit
clean-dracut-module: uninstall-dracut-module clean-dracut-module: uninstall-dracut-module
sudo rm -rf /usr/lib/dracut/module.d/90metadata-collect sudo rm -rf /usr/lib/dracut/module.d/90metadata-collect
......
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