Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2019-10-14 21:15:56 -07:00
3 changed files with 21 additions and 77 deletions

View File

@@ -40,10 +40,8 @@ endif
SCST_DIR=scst
DOC_DIR=doc
SCSTADM_DIR=scstadmin
QLA_DIR=qla2xxx-unified-target
QLA_GIT_DIR=qla2x00t_git/scst-qla2xxx-unified
QLA_OLD_INI_DIR=qla2x00t
QLA_OLD_DIR=qla2x00t/qla2x00-target
QLA_INI_DIR=qla2x00t
QLA_DIR=qla2x00t/qla2x00-target
LSI_DIR=mpt
USR_DIR=usr
SRP_DIR=srpt
@@ -80,18 +78,11 @@ help:
@echo " scstadm_uninstall : scstadmin: uninstall"
@echo ""
@echo " qla : make QLA target driver"
@echo " qla_pull : pull the latest version of the QLA target driver from the QLogic's git"
@echo " qla_clean : qla target: clean "
@echo " qla_extraclean : qla target: clean + clean dependencies"
@echo " qla_install : qla target: install"
@echo " qla_uninstall : qla target: uninstall"
@echo ""
@echo " qla_old : make old Qlogic chipsets target driver"
@echo " qla_old_clean : qla old target: clean "
@echo " qla_old_extraclean: qla old target: clean + clean dependencies"
@echo " qla_old_install : qla old target: install"
@echo " qla_old_uninstall : qla old target: uninstall"
@echo ""
@echo " iscsi : make iSCSI target"
@echo " iscsi_clean : ISCSI target: clean "
@echo " iscsi_extraclean : ISCSI target: clean + clean dependencies"
@@ -148,8 +139,7 @@ help:
all:
cd $(SCST_DIR) && $(MAKE) $@
# @if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; else if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi fi
# @if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
# @if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -160,8 +150,7 @@ all:
install:
cd $(SCST_DIR) && $(MAKE) $@
# @if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; else if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi fi
# @if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
# @if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -172,8 +161,7 @@ install:
uninstall:
cd $(SCST_DIR) && $(MAKE) $@
# @if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; else if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi fi
# @if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -184,9 +172,8 @@ uninstall:
clean:
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -198,9 +185,8 @@ extraclean:
-rm -f TAGS tags cscope.out
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
# @if [ -d $(LSI_DIR) ]; then cd $(LSI_DIR) && $(MAKE) $@; fi
@if [ -d $(SRP_DIR) ]; then cd $(SRP_DIR) && $(MAKE) $@; fi
@if [ -d $(ISCSI_DIR) ]; then cd $(ISCSI_DIR) && $(MAKE) $@; fi
@@ -253,9 +239,6 @@ scstadm_extraclean:
qla:
cd $(QLA_DIR) && $(MAKE) all
qla_pull:
cd $(QLA_GIT_DIR) && git pull
qla_install:
cd $(QLA_DIR) && $(MAKE) install
@@ -268,21 +251,6 @@ qla_clean:
qla_extraclean:
cd $(QLA_DIR) && $(MAKE) extraclean
qla_old:
cd $(QLA_OLD_DIR) && $(MAKE) all
qla_old_install:
cd $(QLA_OLD_DIR) && $(MAKE) install
qla_old_uninstall:
cd $(QLA_OLD_DIR) && $(MAKE) uninstall
qla_old_clean:
cd $(QLA_OLD_DIR) && $(MAKE) clean
qla_old_extraclean:
cd $(QLA_OLD_DIR) && $(MAKE) extraclean
iscsi:
cd $(ISCSI_DIR) && $(MAKE) all
@@ -413,14 +381,7 @@ make-scst-dist = \
mkdir "$${name}-$(3)" && \
{ \
{ \
if [ -e qla2x00t_git ]; then \
scripts/list-source-files | grep -v ^qla2x00t/; \
( dir="$$PWD" && cd qla2x00t_git && \
"$$dir/scripts/list-source-files" ) | \
sed 's,^,qla2x00t_git/,'; \
else \
scripts/list-source-files; \
fi && \
scripts/list-source-files && \
if [ -e debian/changelog ]; then echo debian/changelog; fi; \
} | \
$(4) | \
@@ -554,7 +515,6 @@ release-archive:
.PHONY: all install uninstall clean extraclean tags help \
qla qla_install qla_uninstall qla_clean qla_extraclean \
qla_old qla_old_install qla_old_uninstall qla_old_clean qla_old_extraclean \
lsi lsi_install lsi_uninstall lsi_clean lsi_extraclean \
iscsi iscsi_install iscsi_uninstall iscsi_clean iscsi_extraclean \
emulex emulex_install emulex_uninstall emulex_clean emulex_extraclean \

View File

@@ -114,15 +114,9 @@ export KVER=%{kversion} PREFIX=%{_prefix}
%{?kdir:%{expand:%%(export KDIR=%{kdir})}}
export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
make 2release
for d in scst fcst iscsi-scst scst_local srpt; do
for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
%{make} -C $d
done
for d in qla2x00t_git/qla2x00-target qla2x00t/qla2x00-target; do
if [ -e $d ]; then
%{make} -C $d
break
fi
done
%install
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
@@ -131,15 +125,9 @@ 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 scst_local srpt; do
for d in fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
DESTDIR=%{buildroot} INSTALL_MOD_PATH=%{buildroot} %{make} -C $d install
done
for d in qla2x00t_git/qla2x00-target qla2x00t/qla2x00-target; do
if [ -e $d ]; then
DESTDIR=%{buildroot} INSTALL_MOD_PATH=%{buildroot} %{make} -C $d install
break
fi
done
# Set the executable bit such that /usr/lib/rpm/find-debuginfo.sh can find the
# SCST kernel modules.
find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x

View File

@@ -56,28 +56,24 @@
<div id="main">
<h1>Target driver qla2x00t for QLogic FC adapters</h1>
<p><img src="images/t_qlogic.gif" width="100" height="120" class="float-left" alt="SCST QLogic">
This is target driver for QLogic qla2xxx (22xx++) Fibre Channel adapters.</p>
This is a target driver for QLogic qla2xxx (22xx++) Fibre Channel adapters. It is stable and well tested.</p>
<p>This driver starting from version 3.1 supports 16G Hilda QLogic
chip based adapters (post-Hilda QLogic chips not supported) and has many other important improvements.
This driver should also support FCoE, but that has never been verified.
It has passed intensive internal SanDisk tests. It is stable and production ready.
This driver is in stable maintenance mode in favor of the
QLogic git tree driver (see below). This is the recommended driver to use in production at the moment.
This is the recommended driver to use in production at the moment.
</p>
<p>You can find the latest updates for this driver in the SVN trunk.</p>
<p>The latest QLogic maintained version of this driver with full support
of the latest QLogic chips for both FC and FCoE, including 32G FC, you can find in
git://git.qlogic.com/scst-qla2xxx-unified.git.
It is maintained by QLogic, hence located in the QLogic's git. See SVN root README
for instructions how to integrate it into the SCST build tree.</p>
<p>Version released in March 2018 seems to be well functional and stable.
However, NPIV, T10-PI as well as modifying port name is not yet supported.
Also, this driver does not support old adapters (same as the in-kernel qla2xxx it is based on).</p>
<p>A newer and experimental QLogic target
driver is available in the qla2x00t-32gbit
directory. That driver supports all adapters
supported by the qla2x00t driver and also
several newer adapters. The existing
qla2x00t driver will be replaced by the
qla2x00t-32gbit driver once it is stable
enough.
</p>
<p class="post-footer align-right">
<a href="qla2x00t-howto.html" class="readmore">HOWTO</a>
<a href="https://blog.it-kb.ru/2018/03/12/configure-the-server-with-qlogic-fc-hba-on-debian-linux-9-and-scst-fc-target-as-storage-for-csv-volumes-in-the-hyper-v-cluster-for-highly-available-virtual-machines/" class="readmore"> Russian HOWTO</a>