mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-09-14 17:30:08 -07:00
parent 4ca22bd4e6 f6371c5d5e
commit e16e4dbc21
15 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fcst/Makefile
View File

@@ -74,8 +74,8 @@ tgt: $(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
ins:

4
ibmvstgt/Makefile
View File

@@ -37,8 +37,8 @@ all: src/$(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) M=$(shell pwd)/src modules
install: all src/ibmvstgt.ko
$(MAKE) -C $(KDIR) M=$(shell pwd)/src \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd)/src \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

12
iscsi-scst/Makefile
View File

@@ -149,14 +149,14 @@ install: all
@install -vD -m 644 doc/manpages/iscsi-scstd.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scstd.8
@install -vD -m 755 usr/iscsi-scst-adm $(DESTDIR)$(SBINDIR)/iscsi-scst-adm
@install -vD -m 644 doc/manpages/iscsi-scst-adm.8 $(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8
$(MAKE) -C $(KDIR) M=$(KMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(KMOD) \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
$(MAKE) -C $(KDIR) M=$(ISERTMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install; \
if $(INFINIBAND_ENABLED); then \
$(MAKE) -C $(KDIR) M=$(ISERTMOD) \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install; \
fi
uninstall:

4
mpt/Makefile
View File

@@ -73,8 +73,8 @@ tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)

4
mvsas_tgt/Makefile
View File

@@ -88,8 +88,8 @@ tgt: Modules.symvers Module.symvers
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=n
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
ins:

4
qla2x00t-32gbit/Makefile
View File

@@ -62,8 +62,8 @@ all:
$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

4
qla2x00t-32gbit/qla2x00-target/Makefile
View File

@@ -101,8 +101,8 @@ install: all
ifneq ($(BUILD_2X_MODULE),)
$(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@
endif
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

4
qla2x00t/Makefile
View File

@@ -59,8 +59,8 @@ all:
$(CONFIG_SCSI_QLA2XXX_TARGET)=CONFIG_SCSI_QLA2XXX_TARGET
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

4
qla2x00t/qla2x00-target/Makefile
View File

@@ -100,8 +100,8 @@ install: all
ifneq ($(BUILD_2X_MODULE),)
$(MAKE) M=$(QLA2XXX_DIR) -C $(QLA2XXX_DIR) $@
endif
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

2
scst-dkms.spec.in
View File

@@ -115,7 +115,7 @@ for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
done
%install
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir}
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
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

2
scst.spec.in
View File

@@ -125,7 +125,7 @@ for d in qla2x00t_git/qla2x00-target qla2x00t/qla2x00-target; do
done
%install
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir}
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
%{?kdir:%{expand:%%(export KDIR=%{kdir})}}
export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
for d in scst; do

3
scst/src/Makefile
View File

@@ -128,9 +128,10 @@ install: all
false; fi
-rm -f $(INSTALL_DIR)/scsi_tgt.ko
$(MAKE) -C $(KDIR) M=$(shell pwd)/dev_handlers \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true)\
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
install -d $(INSTALL_DIR_H)
header_files="backport.h scst.h scst_const.h scst_debug.h \

4
scst/src/dev_handlers/Makefile
View File

@@ -65,8 +65,8 @@ all:
install: all
mkdir -p $(DESTDIR)/var/lib/scst/vdev_mode_pages
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall:

4
scst_local/Makefile
View File

@@ -51,8 +51,8 @@ all: $(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m
install: all
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$(MAKE) -C $(KDIR) M=$(shell pwd) BUILD_INI=m \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
$(MODULE_SYMVERS): $(SCST_DIR)/$(MODULE_SYMVERS)

2
srpt/Makefile
View File

@@ -109,7 +109,7 @@ install: all
find /lib/modules/$(KVER) -name ib_srpt.ko -exec rm {} \; ; \
true
$(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)" \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
$$([ -n "$(DEPMOD)" ] && echo "DEPMOD=$(DEPMOD)") \
modules_install
uninstall: