]> git.proxmox.com Git - pve-kernel-jessie.git/blobdiff - Makefile
projects / pve-kernel-jessie.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
buildsys: update make upload target for stretch
[pve-kernel-jessie.git] / Makefile
diff --git a/Makefile b/Makefile
index e0cc16f817ad71ed3bbe7a3fe6e62ca81efc74a7..0caa63200e0ee3b165dd9c92d6120a9776a2917d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 RELEASE=5.0
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.4.44
-PKGREL=83
+KERNEL_VER=4.10.1
+PKGREL=2
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=2
 
 KERNEL_SRC=ubuntu-zesty
 KERNELSRCTAR=${KERNEL_SRC}.tgz
@@ -23,17 +23,17 @@ TOP=$(shell pwd)
 
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-FW_VER=1.1
-FW_REL=11
+FW_VER=2.0
+FW_REL=1
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-E1000EDIR=e1000e-3.3.5
+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-4.4.6
+IXGBEDIR=ixgbe-5.0.4
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 # does not compile with kernel 3.19.8
@@ -85,7 +85,7 @@ PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 VIRTUALHDRPACKAGE=pve-headers
 VIRTUAL_HDR_DEB=${VIRTUALHDRPACKAGE}_${RELEASE}-${PKGREL}_all.deb
 
-LINUX_TOOLS_PKG=linux-tools-4.4
+LINUX_TOOLS_PKG=linux-tools-4.10
 LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
@@ -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
@@ -125,7 +125,7 @@ ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
 download:
        rm -rf ${KERNEL_SRC} ${KERNELSRCTAR}
        #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
-       git clone --single-branch -b Ubuntu-4.10.0-11.13 git://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.10.0-13.15 git://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
@@ -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,8 +282,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       # patch used for igb and e1000e!
-       cd ${E1000EDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch
+       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
 
@@ -291,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
 
@@ -300,9 +301,8 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       # HACK: for kernel < 4.6, we need to set UTS_UBUNTU_RELEASE_ABI manually
-       # to make it compile
-       cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO -DUTS_UBUNTU_RELEASE_ABI=22" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
+       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
 
 i40e.ko i40e: .compile_mark ${I40ESRC}
@@ -383,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 \
@@ -434,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
@@ -442,7 +442,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
 
 .PHONY: upload
 upload: ${DEBS}
-       tar cf - ${DEBS}|ssh repoman@repo.proxmox.com upload
+       tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: distclean
 distclean: clean
Linux Kernel for Jessie