[pve-devel] r6236 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-06 06:53:32 +0200 (Wed, 06 Jul 2011)
New Revision: 6236

Added:
   pve-kernel-2.6.32/trunk/iscsitarget-1.4.20.2.tar.gz
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2011-07-05 11:11:16 UTC (rev 6235)
+++ pve-kernel-2.6.32/trunk/Makefile	2011-07-06 04:53:32 UTC (rev 6236)
@@ -41,6 +41,9 @@
 ARECADIR=arcmsr.1.20.0X.15-110330
 ARECASRC=${ARECADIR}.zip
 
+ISCSITARGETDIR=iscsitarget-1.4.20.2
+ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
+
 SCSTDIR=scst
 SCSTSRC=scst-snap-21.12.09.tgz
 ISCSIDIR=iscsi-scst
@@ -87,7 +90,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark config-${KERNEL_VER} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi-scst.ko scst-modules.tar iscsi_trgt.ko
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 config-${KERNEL_VER} tmp/boot/config-${KVNAME}
@@ -113,6 +116,8 @@
 	# install scst modules
 	install -m 644 -D iscsi-scst.ko tmp/lib/modules/${KVNAME}/extra/scst/iscsi-scst.ko
 	tar xf scst-modules.tar -C tmp/lib/modules/${KVNAME}/extra/scst
+	# install iscsitarget module
+	install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/extra/iscsi/iscsi_trgt.ko	
 	# remove firmware
 	rm -rf tmp/lib/firmware
 	# strip debug info
@@ -203,6 +208,14 @@
 	cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
 	cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
+iscsi_trgt.ko: ${ISCSITARGETSRC}
+	rm -rf ${ISCSITARGETSRC}
+	tar cf ${ISCSITARGETSRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	cd ${ISCSITARGETDIR}; make KVER=${KVNAME}
+	cp ${ISCSITARGETDIR}/kernel/iscsi_trgt.ko iscsi_trgt.ko
+
 scst-src/AskingQuestions:
 	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
 	tar xf ${SCSTSRC}
@@ -301,6 +314,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko iscsi_trgt.ko ${ISCSITARGETDIR}
 
 

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2011-07-05 11:11:16 UTC (rev 6235)
+++ pve-kernel-2.6.32/trunk/README	2011-07-06 04:53:32 UTC (rev 6236)
@@ -32,7 +32,11 @@
 
   * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip
 
+- include ISCSITARGET driver found at:
 
+  * http://iscsitarget.sourceforge.net/
+
+
 FIRMWARE:
 =========
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2011-07-05 11:11:16 UTC (rev 6235)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2011-07-06 04:53:32 UTC (rev 6236)
@@ -1,6 +1,8 @@
 pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low
 
   * fix register corruption in pvclock_scale_delta
+  
+  * include iscsitarget module
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 22 Jun 2011 10:55:29 +0200
 

Added: pve-kernel-2.6.32/trunk/iscsitarget-1.4.20.2.tar.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/iscsitarget-1.4.20.2.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream