[pve-devel] r5202 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-04 13:01:48 +0000 (Mon, 04 Oct 2010)
New Revision: 5202

Added:
   pve-kernel-2.6.35/trunk/iscsi-scst-adjust-path.diff
   pve-kernel-2.6.35/trunk/iscsi-scst-disable-debug.diff
Modified:
   pve-kernel-2.6.35/trunk/Makefile
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2010-10-04 12:51:33 UTC (rev 5201)
+++ pve-kernel-2.6.35/trunk/Makefile	2010-10-04 13:01:48 UTC (rev 5202)
@@ -141,7 +141,7 @@
 	tar cf scst-modules.tar -C ${SCSTDIR}/modules .	
 	touch ${SCSTDIR}/README
 
-${ISCSI_DEB} iscsi-scst.ko iscsi: ${SCSTDIR}/README scst-src/AskingQuestions
+iscsi-scst.ko iscsi: ${SCSTDIR}/README scst-src/AskingQuestions
 	rm -rf ${ISCSIDIR} iscsi-scst.ko
 	rsync -a --exclude .svn scst-src/iscsi-scst/ ${ISCSIDIR}
 	cd ${ISCSIDIR}; patch -p 1 <../iscsi-scst-adjust-path.diff

Added: pve-kernel-2.6.35/trunk/iscsi-scst-adjust-path.diff
===================================================================
--- pve-kernel-2.6.35/trunk/iscsi-scst-adjust-path.diff	                        (rev 0)
+++ pve-kernel-2.6.35/trunk/iscsi-scst-adjust-path.diff	2010-10-04 13:01:48 UTC (rev 5202)
@@ -0,0 +1,17 @@
+--- iscsi-scst-1.0.1.1/Makefile.orig	2009-12-17 08:21:12.000000000 +0100
++++ iscsi-scst-1.0.1.1/Makefile	2009-12-17 08:33:18.000000000 +0100
+@@ -7,11 +7,9 @@
+ 
+ SUBDIRS := $(shell pwd)
+ 
+-#SCST_INC_DIR := /usr/local/include/scst
+-SCST_INC_DIR := $(SUBDIRS)/../scst/include
+-#SCST_DIR := $(SCST_INC_DIR)
+-SCST_DIR := $(shell pwd)/../scst/src
+-SBINDIR := /usr/local/sbin
++SCST_INC_DIR := $(shell pwd)/../scst/include
++SCST_DIR := $(shell pwd)/../scst/src
++SBINDIR := /usr/sbin
+ INITDIR := /etc/init.d
+ RCDIR := /etc/rc.d
+ KMOD := $(shell pwd)/kernel

Added: pve-kernel-2.6.35/trunk/iscsi-scst-disable-debug.diff
===================================================================
--- pve-kernel-2.6.35/trunk/iscsi-scst-disable-debug.diff	                        (rev 0)
+++ pve-kernel-2.6.35/trunk/iscsi-scst-disable-debug.diff	2010-10-04 13:01:48 UTC (rev 5202)
@@ -0,0 +1,11 @@
+--- iscsi-scst/kernel/Makefile.org	2009-12-17 12:02:01.000000000 +0100
++++ iscsi-scst/kernel/Makefile	2009-12-17 12:02:31.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS
+ #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING
+-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -fno-inline -fno-inline-functions
++EXTRA_CFLAGS += -g -fno-inline -fno-inline-functions
+ 
+ #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES
+