]> git.proxmox.com Git - pve-kernel-jessie.git/blobdiff - Makefile
bump version to 4.4.13-59
[pve-kernel-jessie.git] / Makefile
index ec57a411ba0f6a095984ef38d7658e3af4431a28..51282536bde5c601afce73115bf91925c195fc56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 RELEASE=4.2
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.4.8
-PKGREL=50
+KERNEL_VER=4.4.13
+PKGREL=59
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=2
 
 KERNEL_SRC=ubuntu-xenial
 KERNELSRCTAR=${KERNEL_SRC}.tgz
@@ -32,7 +32,7 @@ E1000ESRC=${E1000EDIR}.tar.gz
 IGBDIR=igb-5.3.4.4
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-4.3.15
+IXGBEDIR=ixgbe-4.4.6
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 # does not compile with kernel 3.19.8
@@ -72,7 +72,7 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 
 # DRBD9
-DRBDVER=9.0.2-1
+DRBDVER=9.0.3-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -81,11 +81,15 @@ DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve
 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_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
 
-all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} ${LINUX_TOOLS_DEB}
+DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
+
+all: check_gcc ${DEBS}
 
 ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        rm -rf proxmox-ve/data
@@ -96,18 +100,29 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
        chmod 0755 proxmox-ve/data/DEBIAN/postinst
        install -m 0755 proxmox-ve/postrm proxmox-ve/data/DEBIAN/postrm
-       echo "git clone git://git.proxmox.com/git/pve-kernel-4.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
+       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
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
+${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
+       rm -rf proxmox-ve/data
+       mkdir -p proxmox-ve/data/DEBIAN
+       mkdir -p proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/
+       sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/pve-headers.control >proxmox-ve/data/DEBIAN/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
+       dpkg-deb --build proxmox-ve/data ${VIRTUAL_HDR_DEB}
+
 # see https://wiki.ubuntu.com/Kernel/Dev/KernelGitGuide
 .PHONY: download
 download:
        rm -rf ${KERNEL_SRC} ${KERNELSRCTAR}
        #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
-       git clone --single-branch -b Ubuntu-4.4.0-22.40 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.4.0-31.50 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
@@ -239,10 +254,11 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 <../bug-950-tcp-fix-tcp_mark_head_lost-to-check-skb-len-before-f.patch
        cd ${KERNEL_SRC}; patch -p1 < ../981-1-PCI-Reverse-standard-ACS-vs-device-specific-ACS-enabling.patch
        cd ${KERNEL_SRC}; patch -p1 < ../981-2-PCI-Quirk-PCH-root-port-ACS-for-Sunrise-Point.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4485-net-fix-infoleak-in-llc.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4486-net-fix-infoleak-in-rtnetlink.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4558-bpf-fix-refcnt-overflow.patch
        cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4794-1-percpu-fix-synchronization-between-chunk-map_extend_.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4794-2-percpu-fix-synchronization-between-synchronous-map-e.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4470-KEYS-potential-uninitialized-variable.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../ceph-scheduler-fix.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -282,7 +298,9 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
+       # 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}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
 i40e.ko i40e: .compile_mark ${I40ESRC}
@@ -319,7 +337,6 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC}
 ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
-       cd ${ZFSDIR}; patch -p1 < ../zfs-fix-default-acl.patch
        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
@@ -363,7 +380,7 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
        chmod 0755 $(headers_tmp)/DEBIAN/postinst
        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-3.10.0.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
+       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
        install -m 0644 ${KERNEL_SRC}/.config $(headers_dir)
        install -m 0644 ${KERNEL_SRC}/Module.symvers $(headers_dir)
@@ -376,6 +393,8 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
        cd ${KERNEL_SRC}; (find arch/x86 -name include -type d -print | \
                xargs -n1 -i: find : -type f) | \
                cpio -pd --preserve-modification-time $(headers_dir)
+       mkdir -p ${headers_tmp}/lib/modules/${KVNAME}
+       ln -sf /usr/src/linux-headers-${KVNAME} ${headers_tmp}/lib/modules/${KVNAME}/build
        dpkg-deb --build $(headers_tmp) ${HDR_DEB}
        #lintian ${HDR_DEB}
 
@@ -410,25 +429,14 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        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
-       echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" >fwdata/usr/share/doc/pve-firmware/SOURCE
+       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
        dpkg-deb --build fwdata ${FW_DEB}
 
 .PHONY: upload
-upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${LINUX_TOOLS_DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       mkdir -p /pve/${RELEASE}/install
-       rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
-       rm -rf /pve/${RELEASE}/extra/${PVEPKG}_*.deb
-       rm -rf /pve/${RELEASE}/extra/linux-tools-*.deb
-       rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
-       rm -rf /pve/${RELEASE}/extra/Packages*
-       cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} ${LINUX_TOOLS_DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+upload: ${DEBS}
+       tar cf - ${DEBS}|ssh repoman@repo.proxmox.com upload
 
 .PHONY: distclean
 distclean: clean