remove hpsa (does not compile)

diff --git a/Makefile b/Makefile
index 60028bf72056dc489feacd8c5a78a146875f7da3..d403b21014125c4e2e372347d578cbcddf33cd6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,10 @@ IXGBESRC=${IXGBEDIR}.tar.gz
 #AACRAIDDIR=aacraid-${AACRAIDVER}.src
 #AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
-HPSAVER=3.4.6
+# does not compile with kernel 3.19.8
+HPSAVER=3.4.8
 HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-140.tar.bz2
 
 # driver does not compile
 #MEGARAID_DIR=megaraid_sas-06.703.11.00
@@ -136,7 +137,7 @@ fwlist-${KVNAME}: data
        ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
        mv fwlist.tmp $@
 
-data: .compile_mark igb.ko ixgbe.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
+data: .compile_mark igb.ko ixgbe.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME}
@@ -147,8 +148,8 @@ data: .compile_mark igb.ko ixgbe.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD
        install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
        # install latest ixgbe driver
        install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
-       # install hpsa driver
-       install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
+       ## install hpsa driver
+       #install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
        # install zfs drivers
        install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
        install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
@@ -220,7 +221,7 @@ aacraid.ko: .compile_mark ${AACRAIDSRC}
 hpsa.ko hpsa: .compile_mark ${HPSASRC}
        rm -rf ${HPSADIR}
        tar xf ${HPSASRC}
-       sed -i ${HPSADIR}/drivers/scsi/hpsa_kernel_compat.h -e 's/^\/\* #define RHEL7.*/#define RHEL7/'
+#      sed -i ${HPSADIR}/drivers/scsi/hpsa_kernel_compat.h -e 's/^\/\* #define RHEL7.*/#define RHEL7/'
        mkdir -p /lib/modules/${KVNAME}
        ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
        make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi modules

diff --git a/README b/README
index 351c4bc9d307d42542d6c462310b20327124705a..cb8e217ac685e84fbf26d0bfa62ad0a49eb74c14 100644 (file)
--- a/README
+++ b/README
@@ -13,9 +13,10 @@ Additional/Updated Modules:
 
 - include latest igb driver from intel/sourceforge
 
-- include latest HPSA driver (HP Smart Array)
-
-  * http://sourceforge.net/projects/cciss/
+# Note: hpsa does not compile with kernel 3.19.8
+#- include latest HPSA driver (HP Smart Array)
+#
+#  * http://sourceforge.net/projects/cciss/
 
 - include native OpenZFS filesystem kernel modules for Linux
 

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