When converting the SCST source code into a series of upstream patches, SCST

is built via the kbuild infastructure. In kernel version 2.6.24 (commit
f77bf01425b11947eeb3b5b54685212c302741b8) the kbuild variable ccflags-y has
been introduced and the use of EXTRA_CFLAGS in kbuild makefiles has been
deprecated. The patch below converts SCST's in-tree makefiles such that these
use ccflags-y instead of EXTRA_CFLAGS when generating kernel patches for
kernel 2.6.24 or later.

Additionally, this patch removes the "default n" from the file
scst/kernel/in-tree/Kconfig.scst since this statement is superfluous.

The patch below has been tested by verifying the output of the following
command:
for ((v=23;v<=32;v++)); do rm -rf re* && scripts/run-regression-tests 2.6.$v; done

Signed-off-by: Bart Van Assche <bart.vanassche@gmail.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1447 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-01-11 19:16:38 +00:00
parent b85002b263
commit 23accb2e12
42 changed files with 338 additions and 11 deletions

View File

@@ -1,5 +1,4 @@
EXTRA_CFLAGS += -Iinclude/scst
EXTRA_CFLAGS += -Idrivers/scsi/qla2xxx
EXTRA_CFLAGS += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -0,0 +1,5 @@
ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
qla2x00tgt-y := qla2x00t.o
obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o

View File

@@ -278,7 +278,7 @@ add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kernel_version}.patch"\
(
add_file "scst/kernel/in-tree/Kconfig.scst" "drivers/scst/Kconfig"
add_file "scst/kernel/in-tree/Makefile.scst" "drivers/scst/Makefile"
add_file "scst/kernel/in-tree/Makefile.scst-${kernel_version}" "drivers/scst/Makefile"
for f in $(ls scst/src/*.[ch] 2>/dev/null)
do
@@ -319,7 +319,7 @@ add_file "scst/README_in-tree" "Documentation/scst/README.scst" \
# Directory drivers/scst/dev_handlers/
(
add_file "scst/kernel/in-tree/Makefile.dev_handlers" \
add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kernel_version}" \
"drivers/scst/dev_handlers/Makefile" \
| process_patch "dev_handlers_makefile.diff"
@@ -383,7 +383,7 @@ if [ "${qla2x00t}" = "true" ]; then
add_file "qla2x00t/qla2x_tgt_def.h" \
"drivers/scsi/qla2xxx/qla2x_tgt_def.h"
add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \
add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kernel_version}" \
"drivers/scst/qla2xxx-target/Makefile"
add_file "qla2x00t/qla2x00-target/Kconfig" \
@@ -462,7 +462,7 @@ fi
(
add_file "scst_local/in-tree/Kconfig" "drivers/scst/scst_local/Kconfig"
add_file "scst_local/in-tree/Makefile" "drivers/scst/scst_local/Makefile"
add_file "scst_local/in-tree/Makefile-${kernel_version}" "drivers/scst/scst_local/Makefile"
add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c"
) \

View File

@@ -2,7 +2,6 @@ menu "SCSI target (SCST) support"
config SCST
tristate "SCSI target (SCST) support"
default n
depends on SCSI && PROC_FS
help
SCSI target (SCST) is designed to provide unified, consistent

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,14 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
obj-m := scst_cdrom.o scst_changer.o scst_disk.o scst_modisk.o scst_tape.o \
scst_vdisk.o scst_raid.o scst_processor.o scst_user.o
obj-$(CONFIG_SCST_DISK) += scst_disk.o
obj-$(CONFIG_SCST_TAPE) += scst_tape.o
obj-$(CONFIG_SCST_CDROM) += scst_cdrom.o
obj-$(CONFIG_SCST_MODISK) += scst_modisk.o
obj-$(CONFIG_SCST_CHANGER) += scst_changer.o
obj-$(CONFIG_SCST_RAID) += scst_raid.o
obj-$(CONFIG_SCST_PROCESSOR) += scst_processor.o
obj-$(CONFIG_SCST_VDISK) += scst_vdisk.o
obj-$(CONFIG_SCST_USER) += scst_user.o

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -0,0 +1,12 @@
ccflags-y += -Iinclude/scst -Wno-unused-parameter
scst-y += scst_main.o
scst-y += scst_targ.o
scst-y += scst_lib.o
scst-y += scst_proc.o
scst-y += scst_mem.o
scst-y += scst_debug.o
obj-$(CONFIG_SCST) += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
scst_local/

View File

@@ -2,9 +2,5 @@ SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
EXTRA_CFLAGS += -I$(SCST_INC_DIR) -I$(SCST_DIR)
#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o

View File

@@ -0,0 +1,6 @@
SCST_INC_DIR := include/scst
SCST_DIR := drivers/scst
ccflags-y += -I$(SCST_INC_DIR) -I$(SCST_DIR)
obj-$(CONFIG_SCST_LOCAL) += scst_local.o