From 23accb2e12f06adeefe6686fb6828880fb70ef36 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Mon, 11 Jan 2010 19:16:38 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1447 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- .../{Makefile_in-tree => Makefile_in-tree-2.6.23} | 3 +-- qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31 | 5 +++++ qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32 | 5 +++++ scripts/generate-kernel-patch | 8 ++++---- scst/kernel/in-tree/Kconfig.scst | 1 - ...e.dev_handlers => Makefile.dev_handlers-2.6.23} | 0 scst/kernel/in-tree/Makefile.dev_handlers-2.6.24 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.25 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.26 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.27 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.28 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.29 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.30 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.31 | 14 ++++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.32 | 14 ++++++++++++++ .../{Makefile.scst => Makefile.scst-2.6.23} | 0 scst/kernel/in-tree/Makefile.scst-2.6.24 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.25 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.26 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.27 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.28 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.29 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.30 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.31 | 12 ++++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.32 | 12 ++++++++++++ scst_local/in-tree/{Makefile => Makefile-2.6.23} | 4 ---- scst_local/in-tree/Makefile-2.6.24 | 6 ++++++ scst_local/in-tree/Makefile-2.6.25 | 6 ++++++ scst_local/in-tree/Makefile-2.6.26 | 6 ++++++ scst_local/in-tree/Makefile-2.6.27 | 6 ++++++ scst_local/in-tree/Makefile-2.6.28 | 6 ++++++ scst_local/in-tree/Makefile-2.6.29 | 6 ++++++ scst_local/in-tree/Makefile-2.6.30 | 6 ++++++ scst_local/in-tree/Makefile-2.6.31 | 6 ++++++ scst_local/in-tree/Makefile-2.6.32 | 6 ++++++ 42 files changed, 338 insertions(+), 11 deletions(-) rename qla2x00t/qla2x00-target/{Makefile_in-tree => Makefile_in-tree-2.6.23} (52%) create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31 create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32 rename scst/kernel/in-tree/{Makefile.dev_handlers => Makefile.dev_handlers-2.6.23} (100%) create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.24 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.25 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.26 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.27 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.28 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.29 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.30 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.31 create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.32 rename scst/kernel/in-tree/{Makefile.scst => Makefile.scst-2.6.23} (100%) create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.24 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.25 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.26 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.27 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.28 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.29 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.30 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.31 create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.32 rename scst_local/in-tree/{Makefile => Makefile-2.6.23} (54%) create mode 100644 scst_local/in-tree/Makefile-2.6.24 create mode 100644 scst_local/in-tree/Makefile-2.6.25 create mode 100644 scst_local/in-tree/Makefile-2.6.26 create mode 100644 scst_local/in-tree/Makefile-2.6.27 create mode 100644 scst_local/in-tree/Makefile-2.6.28 create mode 100644 scst_local/in-tree/Makefile-2.6.29 create mode 100644 scst_local/in-tree/Makefile-2.6.30 create mode 100644 scst_local/in-tree/Makefile-2.6.31 create mode 100644 scst_local/in-tree/Makefile-2.6.32 diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 similarity index 52% rename from qla2x00t/qla2x00-target/Makefile_in-tree rename to qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 index 818733b7c..4f2dc0b7e 100644 --- a/qla2x00t/qla2x00-target/Makefile_in-tree +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23 @@ -1,5 +1,4 @@ -EXTRA_CFLAGS += -Iinclude/scst -EXTRA_CFLAGS += -Idrivers/scsi/qla2xxx +EXTRA_CFLAGS += -Iinclude/scst -Idrivers/scsi/qla2xxx qla2x00tgt-y := qla2x00t.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32 @@ -0,0 +1,5 @@ +ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx + +qla2x00tgt-y := qla2x00t.o + +obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 1ee0441a1..c06f87e85 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -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" ) \ diff --git a/scst/kernel/in-tree/Kconfig.scst b/scst/kernel/in-tree/Kconfig.scst index 7f45915b7..feab9f97a 100644 --- a/scst/kernel/in-tree/Kconfig.scst +++ b/scst/kernel/in-tree/Kconfig.scst @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 similarity index 100% rename from scst/kernel/in-tree/Makefile.dev_handlers rename to scst/kernel/in-tree/Makefile.dev_handlers-2.6.23 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.24 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.24 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.24 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.25 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.25 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.25 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.26 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.26 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.26 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.27 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.27 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.27 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.28 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.28 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.28 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.29 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.29 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.29 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.30 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.30 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.30 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.31 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.31 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.31 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.32 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.32 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.32 @@ -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 diff --git a/scst/kernel/in-tree/Makefile.scst b/scst/kernel/in-tree/Makefile.scst-2.6.23 similarity index 100% rename from scst/kernel/in-tree/Makefile.scst rename to scst/kernel/in-tree/Makefile.scst-2.6.23 diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.24 b/scst/kernel/in-tree/Makefile.scst-2.6.24 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.24 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.25 b/scst/kernel/in-tree/Makefile.scst-2.6.25 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.25 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.26 b/scst/kernel/in-tree/Makefile.scst-2.6.26 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.26 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.27 b/scst/kernel/in-tree/Makefile.scst-2.6.27 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.27 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.28 b/scst/kernel/in-tree/Makefile.scst-2.6.28 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.28 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.29 b/scst/kernel/in-tree/Makefile.scst-2.6.29 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.29 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.30 b/scst/kernel/in-tree/Makefile.scst-2.6.30 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.30 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.31 b/scst/kernel/in-tree/Makefile.scst-2.6.31 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.31 @@ -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/ + diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.32 b/scst/kernel/in-tree/Makefile.scst-2.6.32 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.32 @@ -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/ + diff --git a/scst_local/in-tree/Makefile b/scst_local/in-tree/Makefile-2.6.23 similarity index 54% rename from scst_local/in-tree/Makefile rename to scst_local/in-tree/Makefile-2.6.23 index 3947d2927..a54bb760e 100644 --- a/scst_local/in-tree/Makefile +++ b/scst_local/in-tree/Makefile-2.6.23 @@ -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 diff --git a/scst_local/in-tree/Makefile-2.6.24 b/scst_local/in-tree/Makefile-2.6.24 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.24 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.25 b/scst_local/in-tree/Makefile-2.6.25 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.25 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.26 b/scst_local/in-tree/Makefile-2.6.26 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.26 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.27 b/scst_local/in-tree/Makefile-2.6.27 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.27 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.28 b/scst_local/in-tree/Makefile-2.6.28 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.28 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.29 b/scst_local/in-tree/Makefile-2.6.29 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.29 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.30 b/scst_local/in-tree/Makefile-2.6.30 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.30 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.31 b/scst_local/in-tree/Makefile-2.6.31 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.31 @@ -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 + diff --git a/scst_local/in-tree/Makefile-2.6.32 b/scst_local/in-tree/Makefile-2.6.32 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.32 @@ -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 +