update kernel source to Ubuntu-4.2.0-14.16 (rebase to v4.2.2)

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 9cdfac9c706873e29f76317b4fc746e2ce70c8c3..1aae7d0f2a999230be624547260f0c7594ef1fa8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.0
 
-KERNEL_VER=4.2.0
-PKGREL=10
-# also i7clude firmware of previous versrion into 
+KERNEL_VER=4.2.2
+PKGREL=15
+# also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
 
@@ -29,12 +29,11 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 #E1000EDIR=e1000e-3.1.0.2
 #E1000ESRC=${E1000EDIR}.tar.gz
 
-#IGBDIR=igb-5.3.2
+#IGBDIR=igb-5.3.3.2
 #IGBSRC=${IGBDIR}.tar.gz
 
-# does not compile with kernel 4.1
-#IXGBEDIR=ixgbe-4.1.2
-#IXGBESRC=${IXGBEDIR}.tar.gz
+IXGBEDIR=ixgbe-4.1.5
+IXGBESRC=${IXGBEDIR}.tar.gz
 
 # does not compile with kernel 3.19.8
 #I40EDIR=i40e-1.2.38
@@ -137,7 +136,7 @@ fwlist-${KVNAME}: data
        ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
        mv fwlist.tmp $@
 
-data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
+data: .compile_mark 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}
@@ -146,8 +145,8 @@ data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
        cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
        ## install latest ibg driver
        #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 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 zfs drivers
@@ -164,6 +163,9 @@ data: .compile_mark ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
        mv tmp data
 
 PVE_CONFIG_OPTS= \
+-d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
+-d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
+-e CONFIG_TRANSPARENT_HUGEPAGE_NEVER \
 -m CONFIG_CEPH_FS \
 -m CONFIG_BLK_DEV_NBD \
 -m CONFIG_BLK_DEV_RBD \
@@ -200,9 +202,8 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        rm -rf ${KERNEL_SRC}
        tar xf ${KERNELSRCTAR}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
-       # see https://github.com/zfsonlinux/zfs/issues/3511
-       # should be fixed with zfs 0.6.5
-       cd ${KERNEL_SRC}; patch -p1 <../0001-Revert-block-loop-switch-to-VFS-ITER_BVEC.patch
+       cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch
+       cd ${KERNEL_SRC}; patch -p1 <../fix-rtnl_bridge_getlink.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch