[pve-devel] r6430 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-08 06:37:11 +0200 (Mon, 08 Aug 2011)
New Revision: 6430

Added:
   pve-kernel-2.6.35/trunk/arcmsr.1.20.0X.15-110330.zip
Modified:
   pve-kernel-2.6.35/trunk/Makefile
   pve-kernel-2.6.35/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2011-08-05 10:41:02 UTC (rev 6429)
+++ pve-kernel-2.6.35/trunk/Makefile	2011-08-08 04:37:11 UTC (rev 6430)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 KERNEL_VER=2.6.35
-PKGREL=12
+PKGREL=13
 
 KREL=2
 
@@ -11,7 +11,7 @@
 HDRPACKAGE=pve-headers-${KVNAME}
 
 # ubuntu git branch
-UBUNTU_BRANCH=Ubuntu-2.6.35-30.55
+UBUNTU_BRANCH=Ubuntu-2.6.35-30.56
 
 ARCH=amd64
 TOP=$(shell pwd)
@@ -21,6 +21,9 @@
 AOEDIR=aoe6-75
 AOESRC=${AOEDIR}.tar.gz
 
+ARECADIR=arcmsr.1.20.0X.15-110330
+ARECASRC=${ARECADIR}.zip
+
 SCSTDIR=scst
 SCSTSRC=scst-snap-04.10.10.tgz
 ISCSIDIR=iscsi-scst
@@ -63,7 +66,7 @@
 	lintian ${DST_DEB}
 
 
-data: .compile_mark config-${KERNEL_VER} aoe.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark config-${KERNEL_VER} aoe.ko arcmsr.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}
@@ -72,6 +75,8 @@
 	cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
 	# install latest aoe driver
 	install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
+	# 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
@@ -132,6 +137,14 @@
 	cd ${AOEDIR}; make KVER=${KVNAME}
 	cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.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}

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


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

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2011-08-05 10:41:02 UTC (rev 6429)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2011-08-08 04:37:11 UTC (rev 6430)
@@ -1,3 +1,11 @@
+pve-kernel-2.6.35 (2.6.35-13) unstable; urgency=low
+
+  * Update to Ubuntu-2.6.35-30.56
+  
+  * update ARECA RAID driver
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 08 Aug 2011 06:34:38 +0200
+
 pve-kernel-2.6.35 (2.6.35-12) unstable; urgency=low
 
   * Update to Ubuntu-2.6.35-30.55