update linux-tools paths for 4.10

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 31501ab654d409185e3cf7cf1e3c814627d2a74d..62777a38920db37dad2652aeaa34ea51e68f8dd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 E1000EDIR=e1000e-3.3.5.3
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.5.3
+IGBDIR=igb-5.3.5.4
 IGBSRC=${IGBDIR}.tar.gz
 
 IXGBEDIR=ixgbe-5.0.4
@@ -106,7 +106,7 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
        echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
        install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${PVEPKG}
        install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${PVEPKG}
-       gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
+       gzip -n --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
@@ -117,7 +117,7 @@ ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
        echo "git clone git://git.proxmox.com/git/pve-kernel-4.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/SOURCE
        install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}
        install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}
-       gzip --best proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
+       gzip -n --best proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
        dpkg-deb --build proxmox-ve/data ${VIRTUAL_HDR_DEB}
 
 # see https://wiki.ubuntu.com/Kernel/Dev/KernelGitGuide
@@ -147,7 +147,7 @@ ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.D
        install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
        install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
        echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
-       gzip -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian
+       gzip -n -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian
        rm -f data/lib/modules/${KVNAME}/source
        rm -f data/lib/modules/${KVNAME}/build
        dpkg-deb --build data ${DST_DEB}
@@ -162,8 +162,8 @@ ${LINUX_TOOLS_DEB}: .compile_mark control.tools changelog.Debian copyright
        echo 9 > linux-tools/debian/compat
        cp changelog.Debian linux-tools/debian/changelog
        cp copyright linux-tools/debian
-       mkdir -p linux-tools/debian/linux-tools-4.4/usr/bin
-       install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.4/usr/bin/perf_4.4
+       mkdir -p linux-tools/debian/linux-tools-4.10/usr/bin
+       install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.10/usr/bin/perf_4.10
        cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done
        lintian ${LINUX_TOOLS_DEB}
 
@@ -282,6 +282,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
+       cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
@@ -289,8 +291,9 @@ igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       # patch used for igb and e1000e!
-       cd ${IGBDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch
+       cd ${IGBDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
+       cd ${IGBDIR}; patch -p1 < ../igb_4.9_compat.patch
+       cd ${IGBDIR}; patch -p1 < ../igb_4.10_compat.patch
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
@@ -298,6 +301,7 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
@@ -379,7 +383,7 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
        install -D -m 644 copyright $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/copyright
        install -D -m 644 changelog.Debian $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
        echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
-       gzip -f --best $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
+       gzip -n -f --best $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
        install -m 0644 ${KERNEL_SRC}/.config $(headers_dir)
        install -m 0644 ${KERNEL_SRC}/Module.symvers $(headers_dir)
        cd ${KERNEL_SRC}; find . -path './debian/*' -prune -o -path './include/*' -prune -o -path './Documentation' -prune \
@@ -430,7 +434,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        install -d fwdata/usr/share/doc/pve-firmware/licenses
        cp linux-firmware.git/LICEN[CS]E* fwdata/usr/share/doc/pve-firmware/licenses
        install -D -m 0644 changelog.firmware fwdata/usr/share/doc/pve-firmware/changelog.Debian
-       gzip -9 fwdata/usr/share/doc/pve-firmware/changelog.Debian
+       gzip -n -9 fwdata/usr/share/doc/pve-firmware/changelog.Debian
        echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" >fwdata/usr/share/doc/pve-firmware/SOURCE
        install -d fwdata/DEBIAN
        sed -e 's/@VERSION@/${FW_VER}-${FW_REL}/' <control.firmware >fwdata/DEBIAN/control