[pve-devel] r6103 - in pve-kernel-2.6.32/trunk: . firmware-misc

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 17 09:28:16 CEST 2011


Author: dietmar
Date: 2011-06-17 09:28:16 +0200 (Fri, 17 Jun 2011)
New Revision: 6103

Added:
   pve-kernel-2.6.32/trunk/arcmsr.1.20.0X.15-110330.zip
   pve-kernel-2.6.32/trunk/firmware-misc/README
   pve-kernel-2.6.32/trunk/firmware-misc/cbfw_fc.bin
   pve-kernel-2.6.32/trunk/firmware-misc/ctfw_cna.bin
   pve-kernel-2.6.32/trunk/firmware-misc/ctfw_fc.bin
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/assemble-firmware.pl
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/changelog.firmware
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2011-06-17 07:08:59 UTC (rev 6102)
+++ pve-kernel-2.6.32/trunk/Makefile	2011-06-17 07:28:16 UTC (rev 6103)
@@ -19,7 +19,7 @@
 KERNEL_DEB_DIFF=linux-2.6_${KERNEL_VER}-${KERNEL_DEB_REL}.diff.gz
 
 FW_VER=1.0
-FW_REL=11
+FW_REL=12
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 AOEDIR=aoe6-73
@@ -37,6 +37,9 @@
 BNX2DIR=netxtreme2-5.2.55
 BNX2SRC=${BNX2DIR}.tar.gz
 
+ARECADIR=arcmsr.1.20.0X.15-110330
+ARECASRC=${ARECADIR}.zip
+
 SCSTDIR=scst
 SCSTSRC=scst-snap-21.12.09.tgz
 ISCSIDIR=iscsi-scst
@@ -83,7 +86,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark config-${KERNEL_VER} 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
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 config-${KERNEL_VER} tmp/boot/config-${KVNAME}
@@ -104,6 +107,8 @@
 	install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
 	install -m 644 bnx2x.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 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
@@ -184,10 +189,18 @@
 	rm -rf ${BNX2DIR}
 	tar xf ${BNX2SRC}
 	mkdir -p /lib/modules/${KVNAME}
-	ln -sf ${TOP}/linux-2.6.24-openvz /lib/modules/${KVNAME}/build
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
 	cd ${BNX2DIR}; make KVER=${KVNAME}
 	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.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
+
 scst-src/AskingQuestions:
 	#svn co https://scst.svn.sourceforge.net/svnroot/scst/trunk scst-src
 	tar xf ${SCSTSRC}
@@ -285,6 +298,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}
+	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
 
 

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2011-06-17 07:08:59 UTC (rev 6102)
+++ pve-kernel-2.6.32/trunk/README	2011-06-17 07:28:16 UTC (rev 6103)
@@ -28,7 +28,11 @@
         * original file linux-5.2.55.zip contains
         netxtreme2-5.2.55.tar.gz (added to repository)
 
+- include update for ARECA RAID cards
 
+  * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip
+
+
 FIRMWARE:
 =========
 

Added: pve-kernel-2.6.32/trunk/arcmsr.1.20.0X.15-110330.zip
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/arcmsr.1.20.0X.15-110330.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pve-kernel-2.6.32/trunk/assemble-firmware.pl
===================================================================
--- pve-kernel-2.6.32/trunk/assemble-firmware.pl	2011-06-17 07:08:59 UTC (rev 6102)
+++ pve-kernel-2.6.32/trunk/assemble-firmware.pl	2011-06-17 07:28:16 UTC (rev 6103)
@@ -164,6 +164,10 @@
 	$fw = 'libertas/gspi8686_v9_helper.bin';
     }
 
+    if ($fw eq 'PE520.cis') {
+	$fw = 'cis/PE520.cis';
+    }
+ 
     if (-f "$fwsrc0/$fw") {
 	copy_fw("$fwsrc0/$fw", $fwdest);
 	next;

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2011-06-17 07:08:59 UTC (rev 6102)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2011-06-17 07:28:16 UTC (rev 6103)
@@ -2,12 +2,16 @@
 
   * update to debian squeeze kernel 2.6.32-35
   
+  * update ARECA RAID driver
+  
   * enable HP Smart Array SCSI driver SCSI_HPSA=m
   
   * enable PMC-Sierra SPC 8001 SAS/SATA SCSI_PM8001=m
   
   * enbale Brocade 1010/1020 10Gb Ethernet BNA=m
   
+  * add Brocade firmware
+  
   * fix applydebpatches.pl: include ${rev}squeeze1 series patches
  
  -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Jun 2011 07:39:07 +0200

Modified: pve-kernel-2.6.32/trunk/changelog.firmware
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.firmware	2011-06-17 07:08:59 UTC (rev 6102)
+++ pve-kernel-2.6.32/trunk/changelog.firmware	2011-06-17 07:28:16 UTC (rev 6103)
@@ -1,3 +1,9 @@
+pve-firmware (1.0-12) unstable; urgency=low
+
+  * add Brocade firmware 
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Jun 2011 08:52:21 +0200
+
 pve-firmware (1.0-10) unstable; urgency=low
 
   * updatd for new QLogic phanfw.bin

Added: pve-kernel-2.6.32/trunk/firmware-misc/README
===================================================================
--- pve-kernel-2.6.32/trunk/firmware-misc/README	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/firmware-misc/README	2011-06-17 07:28:16 UTC (rev 6103)
@@ -0,0 +1,7 @@
+BFA firmware from:
+
+http://www.brocade.com/forms/getFile?p=documents/downloads/HBA/Linux/Drivers/NOARCH/bfa_firmware_linux-2.3.2.3-0.src.rpm
+
+cbfw_fc.bin
+ctfw_cna.bin
+ctfw_fc.bin

Added: pve-kernel-2.6.32/trunk/firmware-misc/cbfw_fc.bin
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/firmware-misc/cbfw_fc.bin
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: pve-kernel-2.6.32/trunk/firmware-misc/ctfw_cna.bin
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/firmware-misc/ctfw_cna.bin
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: pve-kernel-2.6.32/trunk/firmware-misc/ctfw_fc.bin
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/trunk/firmware-misc/ctfw_fc.bin
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream



More information about the pve-devel mailing list