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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2012-01-11 07:01:30 +0100 (Wed, 11 Jan 2012)
New Revision: 6591

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
Log:
use ARECA RAID card driver from upstream kernel


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2012-01-11 05:27:43 UTC (rev 6590)
+++ pve-kernel-2.6.32/trunk/Makefile	2012-01-11 06:01:30 UTC (rev 6591)
@@ -43,8 +43,8 @@
 #BNX2DIR=netxtreme2-6.2.23
 #BNX2SRC=${BNX2DIR}.tar.gz
 
-ARECADIR=arcmsr.1.20.0X.15-110330
-ARECASRC=${ARECADIR}.zip
+#ARECADIR=arcmsr.1.20.0X.15-110330
+#ARECASRC=${ARECADIR}.zip
 
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
@@ -90,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 iscsi_trgt.ko
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko ixgbe.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}
@@ -109,7 +109,7 @@
 	#install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
 	#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 -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
@@ -197,13 +197,13 @@
 #	cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
 #	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko` .
 
-arcmsr.ko: ${ARECASRC}
-	rm -rf ${ARECADIR}
-	unzip ${ARECASRC}
-	mkdir -p /lib/modules/${KVNAME}
-	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-	cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
-	cp ${ARECADIR}/arcmsr.ko arcmsr.ko
+#arcmsr.ko: ${ARECASRC}
+#	rm -rf ${ARECADIR}
+#	unzip ${ARECASRC}
+#	mkdir -p /lib/modules/${KVNAME}
+#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+#	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}

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2012-01-11 05:27:43 UTC (rev 6590)
+++ pve-kernel-2.6.32/trunk/README	2012-01-11 06:01:30 UTC (rev 6591)
@@ -19,10 +19,6 @@
 
 - include latest e1000e driver from intel/sourceforge
 
-- include update for ARECA RAID cards
-
-  * 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/

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2012-01-11 05:27:43 UTC (rev 6590)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2012-01-11 06:01:30 UTC (rev 6591)
@@ -16,6 +16,8 @@
     patch: ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch
   
   * enable usbip module
+  
+  * use ARECA RAID card driver from upstream kernel
 
  -- Proxmox Support Team <support at proxmox.com>  Tue, 10 Jan 2012 07:19:23 +0100