update update aacraid to 1.2.1-40300

diff --git a/Makefile b/Makefile
index 1d3e0178f3be50f3256c4523ded93d15877e9577..20432d145fd12bd73c30fb115f4f16b8e657e69b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,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
+AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
+AACRAIDDIR=aacraid
 
 MEGARAID_DIR=megaraid_sas-06.602.03.00
 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
@@ -204,12 +205,11 @@ megaraid_sas.ko: .compile_mark ${MEGARAID_SRC}
 aacraid.ko: .compile_mark ${AACRAIDSRC}
        rm -rf ${AACRAIDDIR}
        mkdir ${AACRAIDDIR}
-       cd ${AACRAIDDIR};rpm2cpio ../${AACRAIDSRC} |cpio -i
-       cd ${AACRAIDDIR};tar xzf aacraid_source.tgz     
+       cd ${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} modules
-       cp ${AACRAIDDIR}/aacraid.ko .
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source modules
+       cp ${AACRAIDDIR}/aacraid-${AACRAIDVER}.src/aacraid_source/aacraid.ko .
 
 aoe.ko aoe: .compile_mark ${AOESRC}
        # aoe driver updates

diff --git a/README b/README
index 0dcb6b2c8956b8f3c97303855ac9af4263fa74d2..8629962fee6f3e48996d6e98aace707288a2ffa8 100644 (file)
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ Additional/Updated Modules:
 
 - include latest Adaptec aacraid driver
 
-  * http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-30300.tgz
+  * http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-40300.tgz
 
 - include latest megaraid_sas driver
 

diff --git a/aacraid-1.2.1-30300.src.rpm b/aacraid-1.2.1-30300.src.rpm
deleted file mode 100755 (executable)
index 836ea26..0000000
Binary files a/aacraid-1.2.1-30300.src.rpm and /dev/null differ

diff --git a/aacraid-linux-src-1.2.1-40300.tgz b/aacraid-linux-src-1.2.1-40300.tgz
new file mode 100644 (file)
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 969e16794ce89832e48a0e06b7dc52351750cd78..85576d78ee402a635ed182192d9a7a2a74ab5497 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -2,7 +2,9 @@ pve-kernel-2.6.32 (2.6.32-124) unstable; urgency=low
 
   * update megaraid_sas to 06.602.03.00
 
- -- Proxmox Support Team <support@proxmox.com>  Mon, 31 Mar 2014 08:34:12 +0200
+  * update aacraid to 1.2.1-40300
+
+  -- Proxmox Support Team <support@proxmox.com>  Mon, 31 Mar 2014 08:34:12 +0200
 
 pve-kernel-2.6.32 (2.6.32-123) unstable; urgency=low