From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 16 Dec 2013 07:03:52 +0000 (+0100)
Subject: add latest aacraid driver
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b620997b8ac54263ffb456501665001bcae536bb;p=pve-kernel-3.10.0.git

add latest aacraid driver
---

diff --git a/Makefile b/Makefile
index 39ecde2..cbb486c 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,9 @@ IXGBESRC=${IXGBEDIR}.tar.gz
 BNX2DIR=netxtreme2-7.8.56
 BNX2SRC=${BNX2DIR}.tar.gz
 
-#AACRAIDSRC=aacraid-1.2.1-30300.src.rpm
-#AACRAIDDIR=aacraid-1.2.1
+AACRAIDVER=1.2.1-40300
+AACRAIDDIR=aacraid-${AACRAIDVER}.src
+AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
 #MEGARAID_DIR=megaraid_sas-06.600.18.00
 #MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
@@ -86,8 +87,8 @@ fwlist-${KVNAME}: data
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-# iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko
+# iscsi_trgt.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -104,8 +105,8 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2
 	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 -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/bnx2x/
-	## install aacraid drivers
-	#install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+	# install aacraid drivers
+	install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
 	## install megaraid_sas driver
 	#install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
 	## install Highpoint 2710 RAID driver
@@ -178,15 +179,13 @@ ${RHKERSRCDIR}/kernel.spec: ${KERNELSRCRPM}
 #	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${MEGARAID_DIR} modules
 #	cp ${MEGARAID_DIR}/megaraid_sas.ko .
 
-#aacraid.ko: .compile_mark ${AACRAIDSRC}
-#	rm -rf ${AACRAIDDIR}
-#	mkdir ${AACRAIDDIR}
-#	cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i
-#	cd ${AACRAIDDIR};tar xzf aacraid_source.tgz	
-#	mkdir -p /lib/modules/${KVNAME}
-#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-#	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
-#	cp ${AACRAIDDIR}/aacraid.ko .
+aacraid.ko: .compile_mark ${AACRAIDSRC}
+	rm -rf ${AACRAIDDIR}
+	tar xzf ${AACRAIDSRC}
+	mkdir -p /lib/modules/${KVNAME}
+	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+	make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR}/aacraid_source modules
+	cp ${AACRAIDDIR}/aacraid_source/aacraid.ko .
 
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
 	rm -rf ${E1000EDIR}
diff --git a/aacraid-linux-src-1.2.1-40300.tgz b/aacraid-linux-src-1.2.1-40300.tgz
new file mode 100755
index 0000000..622c9ae
Binary files /dev/null and b/aacraid-linux-src-1.2.1-40300.tgz differ
diff --git a/changelog.Debian b/changelog.Debian
index 4f9a9e8..885ab9b 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -7,6 +7,8 @@ pve-kernel-3.10.0 (3.10.0-4) unstable; urgency=low
   * add latest ixgbe driver
   
   * add latest netxtreme2 drivers
+  
+  * add latest aacraid driver
 
  -- Proxmox Support Team <support@proxmox.com>  Mon, 16 Dec 2013 07:25:17 +0100