[pve-devel] r6532 - pve-kernel-2.6.32-rh/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-09-07 07:31:30 +0200 (Wed, 07 Sep 2011)
New Revision: 6532

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


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-06 12:14:41 UTC (rev 6531)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-07 05:31:30 UTC (rev 6532)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 KERNEL_VER=2.6.32
-PKGREL=40
+PKGREL=41
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=6
@@ -46,6 +46,9 @@
 ARECADIR=arcmsr.1.20.0X.15-110330
 ARECASRC=${ARECADIR}.zip
 
+ISCSITARGETDIR=iscsitarget-1.4.20.2
+ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
+
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
@@ -87,7 +90,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko
+data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko iscsi_trgt.ko
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -107,6 +110,8 @@
 	install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
 	# install areca driver
 	install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
+	# install iscsitarget module
+	install -m 644 -D iscsi_trgt.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/iscsi_trgt.ko
 	# remove firmware
 	rm -rf tmp/lib/firmware
 	# strip debug info
@@ -198,6 +203,13 @@
 	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 ${ISCSITARGETDIR}
+	tar xf ${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
 
 headers_tmp := $(CURDIR)/tmp-headers
 headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
@@ -272,6 +284,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko ${BNX2DIR} bnx2.ko cnic.ko
+	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko ${BNX2DIR} bnx2.ko cnic.ko iscsi_trgt.ko ${ISCSITARGETDIR}
 
 

Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-09-06 12:14:41 UTC (rev 6531)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-09-07 05:31:30 UTC (rev 6532)
@@ -31,7 +31,11 @@
   NOTE: we do not install the bnx2x driver, because it does not compile
   with recent kernels
 
+- include ISCSITARGET driver found at:
 
+  * http://iscsitarget.sourceforge.net/
+
+
 FIRMWARE:
 =========
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-06 12:14:41 UTC (rev 6531)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-07 05:31:30 UTC (rev 6532)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-41) unstable; urgency=low
+
+  * include ISCSITARGET driver 
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 07 Sep 2011 07:29:09 +0200
+
 pve-kernel-2.6.32 (2.6.32-40) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab036.1.src.rpm

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


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