From ce4afb414a7d6f5d8975bcfb178165a2d9982c5d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 21 Jun 2021 03:28:58 +0000 Subject: [PATCH] Makefile: Fix the scst-dkms-rpm build Fixes: 1cfa1e7f87b2 ("Makefile: switch to qla-32gbit by default") git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9447 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 2 +- scst-dkms.spec.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 061a3d68c..4d44a96b0 100644 --- a/Makefile +++ b/Makefile @@ -315,7 +315,7 @@ make-scst-dist = \ scst-dist-gzip: scst-$(VERSION).tar.bz2 scst-$(VERSION).tar.bz2: $(SCST_SOURCE_FILES) - $(call make-scst-dist,j,bz2,$(VERSION),grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scripts/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/') + $(call make-scst-dist,j,bz2,$(VERSION),grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|-32gbit)/|^scripts/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/') scst-rpm: name=scst && \ diff --git a/scst-dkms.spec.in b/scst-dkms.spec.in index 1ed6bf987..a3cdb1304 100644 --- a/scst-dkms.spec.in +++ b/scst-dkms.spec.in @@ -132,7 +132,7 @@ space (scst_user). %build export KVER=%{kversion} PREFIX=%{_prefix} export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y -for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do +for d in scst fcst iscsi-scst qla2x00t-32gbit/qla2x00-target scst_local srpt; do %{make} -C $d done @@ -142,7 +142,7 @@ export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y for d in scst; do DESTDIR=%{buildroot} %{make} -C $d install done -for d in fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do +for d in fcst iscsi-scst qla2x00t-32gbit/qla2x00-target scst_local srpt; do DESTDIR=%{buildroot} INSTALL_MOD_PATH=%{buildroot} %{make} -C $d install done rm -f %{buildroot}/lib/modules/%{kversion}/[Mm]odule* @@ -157,7 +157,7 @@ cat >%{buildroot}/usr/src/%{kmod_name}-%{dkms_version}/dkms.conf <<"EOF" PACKAGE_VERSION="%{dkms_version}" PACKAGE_NAME="%{kmod_name}" AUTOINSTALL=yes -MAKE[0]="export KVER=${kernelver} KDIR=${kernel_source_dir} BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y && make 2release && make -sC scst && make -sC fcst && make -sC iscsi-scst && make -sC qla2x00t/qla2x00-target && make -sC scst_local && make -sC srpt && cp */*.ko */*/*.ko *scst*/*/*/*.ko ." +MAKE[0]="export KVER=${kernelver} KDIR=${kernel_source_dir} BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y && make 2release && make -sC scst && make -sC fcst && make -sC iscsi-scst && make -sC qla2x00t-32gbit/qla2x00-target && make -sC scst_local && make -sC srpt && cp */*.ko */*/*.ko *scst*/*/*/*.ko ." CLEAN="make clean" # Remove any existing ib_srpt.ko kernel modules PRE_INSTALL="find /lib/modules/${kernelver} -name ib_srpt.ko -exec rm {} \;"