update hpsa to 3.4.16-145

diff --git a/Makefile b/Makefile
index 78a95e2d4b11f804b8a62a41a95dbcae712415bb..d2692087c20e6c6910769f5c545a22c0675b99df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,9 @@ AACRAIDVER=1.2.1-50667
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 AACRAIDDIR=aacraid
 
-HPSAVER=3.4.6
+HPSAVER=3.4.16
 HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-145.tar.bz2
 
 MEGARAID_DIR=megaraid_sas-06.703.11.00
 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz

diff --git a/changelog.Debian b/changelog.Debian
index b64fb14d133205374c24648b27d7c2a97a87cf68..1b110816c730c4c99b7bf22663c4cf507067ce60 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -17,6 +17,8 @@ pve-kernel-2.6.32 (2.6.32-178) unstable; urgency=low
   * update aacraid sources to aacraid-linux-src-1.2.1-50667.tgz
 
   * use openvswitch from RHEL kernel
+  
+  * update hpsa to 3.4.16-145
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 16 Sep 2016 06:53:07 +0200
 

diff --git a/hpsa-3.4.16-145.tar.bz2 b/hpsa-3.4.16-145.tar.bz2
new file mode 100644 (file)
index 0000000..125f6b9
Binary files /dev/null and b/hpsa-3.4.16-145.tar.bz2 differ

diff --git a/hpsa-3.4.6-170.tar.bz2 b/hpsa-3.4.6-170.tar.bz2
deleted file mode 100644 (file)
index d86c035..0000000
Binary files a/hpsa-3.4.6-170.tar.bz2 and /dev/null differ

diff --git a/hpsa-config-fix.patch b/hpsa-config-fix.patch
index a9eb37e9eb924fc27391df0172f1a5e713c77bfb..c3639a8b6e957f05746f373d5e09c441ba791895 100644 (file)
--- a/hpsa-config-fix.patch
+++ b/hpsa-config-fix.patch
@@ -1,25 +1,25 @@
-diff -ur a/drivers/scsi/hpsa_kernel_compat.h b/drivers/scsi/hpsa_kernel_compat.h
---- a/drivers/scsi/hpsa_kernel_compat.h        2015-01-13 17:54:31.000000000 +0100
-+++ b/drivers/scsi/hpsa_kernel_compat.h        2015-01-13 18:00:01.000000000 +0100
-@@ -49,7 +49,7 @@
- /* #define SLES11sp2plus */
- /* #define RHEL5 */
- /* #define RHEL5u2 */
--/* #define RHEL6 */
-+#define RHEL6
- /* #define RHEL7 */
+--- hpsa-3.4.16/drivers/scsi/hpsa_kernel_compat.h.org  2016-09-21 14:30:54.000000000 +0200
++++ hpsa-3.4.16/drivers/scsi/hpsa_kernel_compat.h      2016-09-21 14:40:12.000000000 +0200
+@@ -43,7 +43,8 @@
+  *
+  */
+ 
+-/* #define RHEL6u5 */
++#define RHEL6U8
++
+ /* #define RHEL7u1 */
  /* Default is kernel.org */
  
-@@ -124,7 +124,7 @@
+@@ -145,7 +146,7 @@
  
- #ifdef RHEL6 /************ RHEL 6 ************/
+ #if defined(RHEL6)/************ RHEL 6 ************/
  #define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO_TIMEOUT 0
 -#define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO 0
 +#define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO 1
- #define KFEATURE_HAS_2011_03_INTERRUPT_HANDLER 1
  #define KFEATURE_CHANGE_QDEPTH_HAS_REASON 1
- #define KFEATURE_HAS_2011_03_STYLE_DEVICE_ATTR 1
-@@ -684,7 +684,7 @@
+ #define KFEATURE_CHANGE_QUEUE_TYPE 1
+ #define KFEATURE_HAS_2011_03_QUEUECOMMAND 0
+@@ -757,7 +758,7 @@
   * the thread that is doing the swapping i/o needs to allocate.
   */
  #define WQ_MEM_RECLAIM (0)