From 5dc06c26de660eade7ba0a981d6b50e9d071a42d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 1 Mar 2010 17:32:38 +0000 Subject: [PATCH] scripts/run-regression-tests works now for the 2.6.33 kernel too. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1525 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33 | 5 +++++ scripts/generate-kernel-patch | 10 ---------- .../in-tree/Kconfig.drivers.Linux-2.6.33.patch | 12 ++++++++++++ scst/kernel/in-tree/Makefile.dev_handlers-2.6.33 | 14 ++++++++++++++ .../in-tree/Makefile.drivers.Linux-2.6.33.patch | 11 +++++++++++ scst/kernel/in-tree/Makefile.scst-2.6.33 | 12 ++++++++++++ scst_local/in-tree/Makefile-2.6.33 | 6 ++++++ 7 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33 create mode 100644 scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.33.patch create mode 100644 scst/kernel/in-tree/Makefile.dev_handlers-2.6.33 create mode 100644 scst/kernel/in-tree/Makefile.drivers.Linux-2.6.33.patch create mode 100644 scst/kernel/in-tree/Makefile.scst-2.6.33 create mode 100644 scst_local/in-tree/Makefile-2.6.33 diff --git a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33 b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33 new file mode 100644 index 000000000..fc6f8e7fa --- /dev/null +++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33 @@ -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 a4f7bc1b1..98b6b3f48 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -348,16 +348,6 @@ done } \ | process_patch "fcst.diff" -{ - if [ "${kernel_version}" = 2.6.33 ]; then - for f in $(ls fcst/linux-patches/* 2>/dev/null) - do - cat "${f}" - done - fi -} \ -| process_patch "fcst-in-tree.diff" - add_file "fcst/README" "Documentation/scst/README.fcst" \ | process_patch "fcst-doc.diff" diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.33.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.33.patch new file mode 100644 index 000000000..ea968854f --- /dev/null +++ b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.33.patch @@ -0,0 +1,12 @@ +diff -upkr -X linux-2.6.33/Documentation/dontdiff linux-2.6.33/drivers/Kconfig linux-2.6.33/drivers/Kconfig +--- linux-2.6.33/drivers/Kconfig 2008-07-14 01:51:29.000000000 +0400 ++++ linux-2.6.33/drivers/Kconfig 2008-07-24 14:14:46.000000000 +0400 +@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig" + + source "drivers/scsi/Kconfig" + ++source "drivers/scst/Kconfig" ++ + source "drivers/ata/Kconfig" + + source "drivers/md/Kconfig" diff --git a/scst/kernel/in-tree/Makefile.dev_handlers-2.6.33 b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.33 new file mode 100644 index 000000000..940c7416d --- /dev/null +++ b/scst/kernel/in-tree/Makefile.dev_handlers-2.6.33 @@ -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.drivers.Linux-2.6.33.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.33.patch new file mode 100644 index 000000000..1b37f4a75 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.33.patch @@ -0,0 +1,11 @@ +diff -upkr -X linux-2.6.33/Documentation/dontdiff linux-2.6.33/drivers/Makefile linux-2.6.33/drivers/Makefile +--- linux-2.6.33/drivers/Makefile 2008-07-14 01:51:29.000000000 +0400 ++++ linux-2.6.33/drivers/Makefile 2008-07-24 14:15:29.000000000 +0400 +@@ -41,6 +41,7 @@ obj-$(CONFIG_ATM) += atm/ + obj-y += macintosh/ + obj-$(CONFIG_IDE) += ide/ + obj-$(CONFIG_SCSI) += scsi/ ++obj-$(CONFIG_SCST) += scst/ + obj-$(CONFIG_ATA) += ata/ + obj-y += net/ + obj-$(CONFIG_ATM) += atm/ diff --git a/scst/kernel/in-tree/Makefile.scst-2.6.33 b/scst/kernel/in-tree/Makefile.scst-2.6.33 new file mode 100644 index 000000000..0d899ce13 --- /dev/null +++ b/scst/kernel/in-tree/Makefile.scst-2.6.33 @@ -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-2.6.33 b/scst_local/in-tree/Makefile-2.6.33 new file mode 100644 index 000000000..ec5e0320c --- /dev/null +++ b/scst_local/in-tree/Makefile-2.6.33 @@ -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 +