Commit 0c793534 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

fio: Install plugins during 'make install' 



Fixes #3143

Signed-off-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21390

 (master)

(cherry picked from commit 1e08a4cd)
Change-Id: I28aae7eb053679a5396f84414e291c677407282a
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21612


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Bypass-Merge-Requirements: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 83ef4d2b

mk/spdk.fio.mk

+9 −7
Original line number Diff line number Diff line
@@ -37,13 +37,15 @@ CLEAN_FILES = $(FIO_PLUGIN) 
all : $(FIO_PLUGIN)

	@:



install: empty_rule



uninstall: empty_rule



# To avoid overwriting warning

empty_rule:

	@:

install: all

	$(Q)echo "  INSTALL $(DESTDIR)$(libdir)/fio/$(notdir $(FIO_PLUGIN))";

	$(Q)install -d -m 755 "$(DESTDIR)$(libdir)/fio";

	$(Q)install -m 755 "$(FIO_PLUGIN)" "$(DESTDIR)$(libdir)/fio"



uninstall:

	$(Q)echo "  UNINSTALL $(DESTDIR)$(libdir)/fio/$(notdir $(FIO_PLUGIN))";

	$(Q)rm -f "$(DESTDIR)$(libdir)/fio/$(notdir $(FIO_PLUGIN))";

	$(Q)if [ -d "$(DESTDIR)$(libdir)/fio" ] && [ $$(ls -A "$(DESTDIR)$(libdir)/fio" | wc -l) -eq 0 ]; then rm -rf "$(DESTDIR)$(libdir)/fio"; fi



$(FIO_PLUGIN) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)

rpmbuild/rpm.sh

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ build_macros() { 
		macros+=(-D "dpdk 1")

	fi



	if get_config with-fio; then

		macros+=(-D "fio 1")

	fi



	if get_config with-rbd; then

		macros+=(-D "rbd 1")

		requirements=${requirements:+$requirements, }"librados2, librbd1"

rpmbuild/spdk.spec

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


%{!?deps:%define deps 1}

%{!?dpdk:%define dpdk 0}

%{!?fio:%define fio 0}

%{!?requirements:%define requirements 0}

%{!?build_requirements:%define build_requirements 0}

%{!?shared:%define shared 0}
@@ -111,8 +112,6 @@ rm -rf %{buildroot}/usr/local/share/man 
%if %{vfio_user} && %{shared}

cl %{buildroot}/usr/local/lib/libvfio-user build/libvfio-user/

%endif

# Try to include extra binaries that were potentially built

cfs %{buildroot}/usr/local/bin build/fio



# And some useful setup scripts SPDK uses

mkdir -p %{buildroot}/usr/libexec/spdk
@@ -173,6 +172,9 @@ SPDK static development libraries and header 
/usr/local/include/*

%{libdir}/pkgconfig/*.pc

%{libdir}/*.la

%if %{fio}

%{libdir}/fio

%endif

%if %{shared}

%{libdir}/*.so*

/etc/ld.so.conf.d/spdk.conf