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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-07-18 18:20:08 -07:00
parent f3b97349a0 a7446766c5
commit 0f3c919200
11 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iscsi-scst/kernel/Makefile
View File

@@ -23,9 +23,6 @@
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers
ccflags-y += -I$(src)/../include -I$(src)/../../scst/include
ccflags-y += $(call cc-option,-Wextra) \
$(call cc-option,-Wno-old-style-declaration) \
-Wno-unused-parameter -Wno-missing-field-initializers
ccflags-y += $(PRE_CFLAGS)
#ccflags-y += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES

6
iscsi-scst/kernel/isert-scst/Makefile
View File

@@ -21,13 +21,11 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers \
KBUILD_EXTRA_SYMBOLS = $(src)/../../../scst/src/Module.symvers \
$(src)/../../kernel/Module.symvers \
$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
[ -e $$d ] || continue; echo $$d; break; done)
ccflags-y += -I$(src)/../../include -I$(src)/../../../scst/include
ccflags-y += $(call cc-option,-Wextra) \
$(call cc-option,-Wno-old-style-declaration) \
-Wno-unused-parameter -Wno-missing-field-initializers
obj-m += isert-scst.o
isert-scst-objs := isert.o isert_login.o \

4
qla2x00t-32gbit/Kbuild
View File

@@ -1,6 +1,4 @@
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-Wno-missing-field-initializers \
-I$(src)/../scst/include -I$(src)/include \
ccflags-y += -I$(src)/../scst/include -I$(src)/include \
-DDEFAULT_SYMBOL_NAMESPACE=QLA32GB
ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)

1
qla2x00t-32gbit/qla2x00-target/Kbuild
View File

@@ -1,7 +1,6 @@
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
$(src)/../Module.symvers
ccflags-y += -I$(src)/../../scst/include -I$(src)/..
ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR

4
qla2x00t/Kbuild
View File

@@ -1,6 +1,4 @@
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-Wno-missing-field-initializers -I$(src)/../scst/include\
-DDEFAULT_SYMBOL_NAMESPACE=QLA16GB
ccflags-y += -I$(src)/../scst/include -DDEFAULT_SYMBOL_NAMESPACE=QLA16GB
ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)
ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET)

1
qla2x00t/qla2x00-target/Kbuild
View File

@@ -1,7 +1,6 @@
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
$(src)/../Module.symvers
ccflags-y += -I$(src)/../../scst/include -I$(src)/..
ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD
#ccflags-y += -DCONFIG_QLA_TGT_DEBUG_SRR

12
scst.spec.in
View File

@@ -9,7 +9,7 @@
make -sC "%{kdir}" kernelversion | grep -v ^make)}}
%{!?kdir:
%define kversion %{expand:%%(uname -r)}}}
%{echo:kversion=%{kversion}
%{echo:kdir=%{kdir} kversion=%{kversion}
}
# kernel_rpm: Name of the kernel RPM if the kernel is available as an RPM.
# krpmver: Version of the kernel RPM. Not necessarily identical to kversion.
@@ -115,8 +115,9 @@ Authors:
%setup -q -n %{kmod_name}-%{version}
%build
export KVER=%{kversion} PREFIX=%{_prefix}
%{?kdir:%{expand:%%(export KDIR=%{kdir})}}
%{?kdir:export KDIR=%{kdir}}
%{!?kdir:%{?kversion:export KVER=%{kversion}}}
export PREFIX=%{_prefix}
export BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y
make 2release
for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
@@ -124,8 +125,9 @@ for d in scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local srpt; do
done
%install
export KVER=%{kversion} PREFIX=%{_prefix} MANDIR=%{_mandir} DEPMOD=true
%{?kdir:%{expand:%%(export KDIR=%{kdir})}}
%{?kdir:export KDIR=%{kdir}}
%{!?kdir:%{?kversion:export KVER=%{kversion}}}
export 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

3
scst/src/Kbuild
View File

@@ -1,7 +1,6 @@
# See also Documentation/core-api/symbol-namespaces.rst for more information
# about DEFAULT_SYMBOL_NAMESPACE.
ccflags-y += -I$(src)/../include $(call cc-option,-Wextra) \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare\
ccflags-y += -I$(src)/../include\
-DDEFAULT_SYMBOL_NAMESPACE=SCST\
$(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM)

4
scst/src/dev_handlers/Kbuild
View File

@@ -1,7 +1,5 @@
KBUILD_EXTRA_SYMBOLS=$(src)/../Module.symvers
ccflags-y += -I$(src)/../../include \
$(call cc-option,-Wextra) \
-Wno-unused-parameter -Wno-missing-field-initializers -Wno-sign-compare
ccflags-y += -I$(src)/../../include
#ccflags-y += -DCONFIG_DEBUG_EXT_COPY_REMAP
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \

2
scst_local/Kbuild
View File

@@ -1,6 +1,4 @@
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
ccflags-y += -I$(src)/../scst/include
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter\
-Wno-missing-field-initializers
obj-m := scst_local.o

2
srpt/src/Makefile
View File

@@ -5,6 +5,4 @@ KBUILD_EXTRA_SYMBOLS=$(src)/../../scst/src/Module.symvers \
[ -e $$d ] || continue; echo $$d; break; done)
ccflags-y += -I$(src)/../../scst/include
#ccflags-y += -Wextra -Wno-unused-parameter
obj-m += ib_srpt.o