]> git.proxmox.com Git - pve-kernel-3.10.0.git/blobdiff - Makefile
projects / pve-kernel-3.10.0.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bump version to 3.10.0-27
[pve-kernel-3.10.0.git] / Makefile
diff --git a/Makefile b/Makefile
index 64447fa9c64c5c4ca41fe6646def59802f28e379..e8e611ecd90c8d9d179a7c39784b2022bf27837f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-RELEASE=3.2
+RELEASE=3.3
 
 KERNEL_VER=3.10.0
-PKGREL=14
+PKGREL=27
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=4
+KREL=7
 
-RHKVER=123.el7
+RHKVER=123.13.2.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -33,19 +33,23 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 E1000EDIR=e1000e-3.1.0.2
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.2.9.4
+IGBDIR=igb-5.2.15
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.21.2
+IXGBEDIR=ixgbe-3.23.2
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-BNX2DIR=netxtreme2-7.10.14
+BNX2DIR=netxtreme2-7.11.05
 BNX2SRC=${BNX2DIR}.tar.gz
 
 AACRAIDVER=1.2.1-40700
 AACRAIDDIR=aacraid-${AACRAIDVER}.src
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
+HPSAVER=3.4.6
+HPSADIR=hpsa-${HPSAVER}
+HPSASRC=${HPSADIR}-170.tar.bz2
+
 # driver does not compile
 #MEGARAID_DIR=megaraid_sas-06.703.11.00
 #MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
@@ -61,6 +65,14 @@ ARECASRC=${ARECADIR}.zip
 #ISCSITARGETDIR=iscsitarget-1.4.20.2
 #ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
+ZFSVER=0.6.3-1.2
+SPLDIR=spl-spl-${ZFSVER}
+SPLSRC=spl-${ZFSVER}.tar.gz
+ZFSDIR=zfs-zfs-${ZFSVER}
+ZFSSRC=zfs-${ZFSVER}.tar.gz
+ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
+SPL_MODULES=spl.ko splat.ko
+
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
@@ -70,8 +82,9 @@ all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
 
 .PHONY: download
 download:
-       rm ${KERNELSRCRPM}
-       wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM}
+       rm -f ${KERNELSRCRPM}
+       #wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM}
+       wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM}
 
 check_gcc: 
 ifeq    ($(CC), cc)
@@ -80,9 +93,11 @@ else
        $(CC) --version|grep "4\.7" || false
 endif
 
-${DST_DEB}: data control.in postinst.in postrm.in copyright changelog.Debian
+${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian
        mkdir -p data/DEBIAN
        sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
+       sed -e 's/@@KVNAME@@/${KVNAME}/g'  <prerm.in >data/DEBIAN/prerm
+       chmod 0755 data/DEBIAN/prerm
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <postinst.in >data/DEBIAN/postinst
        chmod 0755 data/DEBIAN/postinst
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <postrm.in >data/DEBIAN/postrm
@@ -102,7 +117,7 @@ fwlist-${KVNAME}: data
        mv fwlist.tmp $@
 
 # fixme: bnx2.ko cnic.ko bnx2x.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -121,12 +136,17 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2
        install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
        # install aacraid drivers
        install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+       # install hpsa driver
+       install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
        # install megaraid_sas driver
        # install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
        ## install Highpoint 2710 RAID driver
        #install -m 644 rr272x_1x.ko -D tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/rr272x_1x/rr272x_1x.ko
        # install areca driver
        install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
+       # install zfs drivers
+       install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
+       install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
        # remove firmware
        rm -rf tmp/lib/firmware
        # strip debug info
@@ -159,9 +179,9 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
        #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
        #cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
-       cd ${KERNEL_SRC}; patch -p1 <../n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch
        cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
        cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
+       cd ${KERNEL_SRC}; patch -p1 <../tg3-fix-deadlock_in_tg3_change_mtu.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -196,6 +216,15 @@ aacraid.ko: .compile_mark ${AACRAIDSRC}
        make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
        cp ${AACRAIDDIR}/aacraid.ko .
 
+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/'
+       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
+       cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
+
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
@@ -237,6 +266,29 @@ arcmsr.ko: .compile_mark ${ARECASRC}
        cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
        cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
+${SPL_MODULES}: .compile_mark ${SPLSRC}
+       rm -rf ${SPLDIR}
+       tar xf ${SPLSRC}
+       cd ${SPLDIR}; ./autogen.sh
+       cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+       cd ${SPLDIR}; make
+       cp ${SPLDIR}/module/spl/spl.ko spl.ko
+       cp ${SPLDIR}/module/splat/splat.ko splat.ko
+
+${ZFS_MODULES}: .compile_mark ${ZFSSRC}
+       rm -rf ${ZFSDIR}
+       tar xf ${ZFSSRC}
+       cd ${ZFSDIR}; ./autogen.sh
+       cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
+       cd ${ZFSDIR}; make
+       cp ${ZFSDIR}/module/zfs/zfs.ko zfs.ko
+       cp ${ZFSDIR}/module/avl/zavl.ko zavl.ko
+       cp ${ZFSDIR}/module/nvpair/znvpair.ko znvpair.ko
+       cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
+       cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
+       cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
+
+
 #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
 #      rm -rf ${ISCSITARGETDIR}
 #      tar xf ${ISCSITARGETSRC}
@@ -322,7 +374,8 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR}
+       rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}
+
 
 
 
Linux Kernel 3.10.0