File scst_modulebuild.patch of Package scst

Overview Repositories Revisions Requests Users Attributes Meta

File scst_modulebuild.patch of Package scst

--- Makefile
+++ Makefile
@@ -15,6 +15,10 @@
 #  GNU General Public License for more details.
 #
 #
+obj-m += scst/
+obj-m += iscsi-scst/kernel/
+obj-m += qla2x00t/
+obj-m += scst_local/
 
 SHELL = /bin/bash
 
--- qla2x00t/Makefile
+++ qla2x00t/Makefile
@@ -1,7 +1,10 @@
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o
 
-obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
+obj-m += qla2x00-target/
+obj-m += qla2xxx.o
+
+EXTRA_CFLAGS += -DCONFIG_SCSI_QLA2XXX_TARGET
 
 clean:
 	rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend *~ Modules.symvers \
--- qla2x00t/qla2x00-target/Makefile
+++ qla2x00t/qla2x00-target/Makefile
@@ -32,15 +32,17 @@
 
 #SCST_INC_DIR := /usr/local/include/scst
 #SCST_DIR := $(SCST_INC_DIR)
-SCST_INC_DIR := $(SUBDIRS)/../../scst/include
+SCST_INC_DIR := $(SUBDIRS)/../scst/include
 SCST_DIR := $(shell pwd)/../../scst/src
+QLA_INC_DIR := $(SUBDIRS)/../qla2x00t
 
-EXTRA_CFLAGS += -I$(SCST_INC_DIR)
+EXTRA_CFLAGS += -I$(SCST_INC_DIR) -I$(QLA_INC_DIR)
 
 INSTALL_DIR := /lib/modules/$(shell uname -r)/extra
 
 EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers
 
+EXTRA_CFLAGS += -DCONFIG_SCSI_QLA2XXX_TARGET
 EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS 
 #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
 EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions
--- scst/Makefile
+++ scst/Makefile
@@ -17,6 +17,8 @@
 #
 #
 
+obj-m += src/
+
 SHELL=/bin/bash
 # Decide to use which kernel src. If not specified, is current running kernel.
 #export KDIR=/usr/src/linux-2.6
--- scst/src/Makefile
+++ scst/src/Makefile
@@ -32,7 +32,7 @@
 DEV_HANDLERS_DIR = dev_handlers
 
 ifneq ($(PATCHLEVEL),)
-SCST_INC_DIR := $(SUBDIRS)/../include
+SCST_INC_DIR := $(SUBDIRS)/../scst/include
 
 obj-m := scst.o
 
--- scst/src/dev_handlers/Makefile
+++ scst/src/dev_handlers/Makefile
@@ -30,7 +30,7 @@
 SHELL=/bin/bash
 
 ifneq ($(PATCHLEVEL),)
-SCST_INC_DIR := $(SUBDIRS)/../include
+SCST_INC_DIR := $(SUBDIRS)/../scst/include
 
 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
--- scst_local/Makefile
+++ scst_local/Makefile
@@ -7,6 +7,7 @@
 SCST_INC_DIR	:= $(SUBDIRS)/../scst/include/
 SCST_DIR	:= $(shell pwd)/../scst/src
 
+EXTRA_CFLAGS	+= -DCONFIG_SCSI_QLA2XXX_TARGET
 EXTRA_CFLAGS	+= -I$(SCST_INC_DIR) -I$(SCST_DIR)
 EXTRA_CFLAGS	+=  -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
 
--- iscsi-scst/kernel/Makefile	2011/10/30 23:47:04	1.1
+++ iscsi-scst/kernel/Makefile	2011/10/30 23:48:26
@@ -20,7 +20,7 @@
 #
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
-EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR)
+EXTRA_CFLAGS += -I$(src)/../include -I$(src)/../../scst/include -I$(SCST_INC_DIR)
 EXTRA_CFLAGS += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
 
 EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS

Places

File scst_modulebuild.patch of Package scst

Places