[pve-devel] r6106 - pve-kernel-2.6.32/pve2

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 17 10:18:30 CEST 2011


Author: dietmar
Date: 2011-06-17 10:18:30 +0200 (Fri, 17 Jun 2011)
New Revision: 6106

Added:
   pve-kernel-2.6.32/pve2/arcmsr.1.20.0X.15-110330.zip
   pve-kernel-2.6.32/pve2/netxtreme2-6.2.23.tar.gz
Removed:
   pve-kernel-2.6.32/pve2/netxtreme2-5.2.55.tar.gz
Modified:
   pve-kernel-2.6.32/pve2/Makefile
   pve-kernel-2.6.32/pve2/README
   pve-kernel-2.6.32/pve2/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/pve2/Makefile
===================================================================
--- pve-kernel-2.6.32/pve2/Makefile	2011-06-17 08:12:32 UTC (rev 6105)
+++ pve-kernel-2.6.32/pve2/Makefile	2011-06-17 08:18:30 UTC (rev 6106)
@@ -1,8 +1,9 @@
 RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=35
-KREL=4
+PKGREL=34
+# alsp include priv firmware into the fw package  fwlist-2.6.32-PREV-pve
+KREL=5
 
 KERNEL_DEB_REL=35
 
@@ -34,9 +35,12 @@
 IXGBEDIR=ixgbe-3.0.14
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-BNX2DIR=netxtreme2-5.2.55
+BNX2DIR=netxtreme2-6.2.23
 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,13 +87,14 @@
 	./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}
 	install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
 	cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
+	sadsad
 	# install drbd module
 	#install -m 644 -D drbd.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd/drbd.ko
 	# install latest aoe driver
@@ -100,10 +105,12 @@
 	install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/e1000e/
 	# install latest ibg driver
 	install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/igb/
-	# install bnx2 and tg3 drivers
+	# install bnx2 drivers
 	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
@@ -183,10 +190,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}
@@ -249,10 +264,10 @@
 	mkdir -p fwdata/lib/firmware
 	./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
 	# include any files from older/newer kernels here
-	./assemble-firmware.pl fwlist-2.6.24-12-pve fwdata/lib/firmware
-	./assemble-firmware.pl fwlist-2.6.18-2-pve fwdata/lib/firmware
-	./assemble-firmware.pl fwlist-2.6.32-3-pve fwdata/lib/firmware
-	./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
+	#./assemble-firmware.pl fwlist-2.6.24-12-pve fwdata/lib/firmware
+	#./assemble-firmware.pl fwlist-2.6.18-2-pve fwdata/lib/firmware
+	#./assemble-firmware.pl fwlist-2.6.32-3-pve fwdata/lib/firmware
+	#./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
 	install -d fwdata/usr/share/doc/pve-firmware
 	cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
 	install -d fwdata/usr/share/doc/pve-firmware/licenses
@@ -284,6 +299,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/pve2/README
===================================================================
--- pve-kernel-2.6.32/pve2/README	2011-06-17 08:12:32 UTC (rev 6105)
+++ pve-kernel-2.6.32/pve2/README	2011-06-17 08:18:30 UTC (rev 6106)
@@ -25,10 +25,14 @@
 
 - include latest broadcom bnx2 drivers
         
-        * original file linux-5.2.55.zip contains
-        netxtreme2-5.2.55.tar.gz (added to repository)
+  * original file linux-6.2.23.zip contains
+    netxtreme2-6.2.23.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:
 =========
 
@@ -38,6 +42,7 @@
 pve-kernel-2.6.18
 pve-kernel-2.6.24
 pve-kernel-2.6.32
+pve-kernel-2.6.35
 
 We use 'find-firmware.pl' to extract lists of required firmeware
 files.  The script 'assemble-firmware.pl' is used to read those lists

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


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

Modified: pve-kernel-2.6.32/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-17 08:12:32 UTC (rev 6105)
+++ pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-17 08:18:30 UTC (rev 6106)
@@ -13,6 +13,8 @@
   * enbale Brocade 1010/1020 10Gb Ethernet BNA=m
 
   * add Brocade firmware
+  
+  * update bnx2 driver
 
   * fix applydebpatches.pl: include ${rev}squeeze1 series patches
   

Deleted: pve-kernel-2.6.32/pve2/netxtreme2-5.2.55.tar.gz
===================================================================
(Binary files differ)

Added: pve-kernel-2.6.32/pve2/netxtreme2-6.2.23.tar.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/pve2/netxtreme2-6.2.23.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream



More information about the pve-devel mailing list