drop patches applied upstream

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 13eb97465377903150c09ef9963de8e6d4096306..0aab1a6532f01e431b459a6edffbc8a458782a5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=5.0
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.10.15
-PKGREL=10
+KERNEL_VER=4.10.17
+PKGREL=17
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -24,7 +24,7 @@ ifneq (${ARCH}, amd64)
 KERNEL_ARCH=${ARCH}
 endif
 
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate -lchangelog.Debian)
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp -lchangelog.Debian)
 
@@ -47,8 +47,12 @@ SPLDIR=pkg-spl
 SPLSRC=submodules/zfs/pkg-spl.tar.gz
 ZFSDIR=pkg-zfs
 ZFSSRC=submodules/zfs/pkg-zfs.tar.gz
-ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
-SPL_MODULES=spl.ko splat.ko
+ZFS_KO=zfs.ko
+ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
+ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
+SPL_KO=spl.ko
+SPL_KO_REST=splat.ko
+SPL_MODULES=$(SPL_KO) $(SPL_KO_REST)
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -64,7 +68,8 @@ DEBS=${DST_DEB} ${HDR_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
 
 all: check_gcc ${DEBS}
 
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
+pve: $(PVE_DEB)
+${PVE_DEB}: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
        rm -rf proxmox-ve/data
        mkdir -p proxmox-ve/data/DEBIAN
        mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
@@ -80,16 +85,17 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS}
        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
-       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.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 -n --best proxmox-ve/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
-       dpkg-deb --build proxmox-ve/data ${VIRTUAL_HDR_DEB}
+pve-headers: $(VIRTUAL_HDR_DEB)
+${VIRTUAL_HDR_DEB}: proxmox-ve/pve-headers.control
+       rm -rf pve-headers/data
+       mkdir -p pve-headers/data/DEBIAN
+       mkdir -p pve-headers/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 >pve-headers/data/DEBIAN/control
+       echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/SOURCE
+       install -m 0644 proxmox-ve/copyright pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
+       install -m 0644 proxmox-ve/changelog.Debian pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}
+       gzip -n --best pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
+       dpkg-deb --build pve-headers/data ${VIRTUAL_HDR_DEB}
 
 check_gcc: 
 ifeq    ($(CC), cc)
@@ -221,7 +227,8 @@ PVE_CONFIG_OPTS= \
        make -C ${KERNEL_SRC}/tools/perf man
        touch $@
 
-${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNEL_SRC_SUBMODULE} | submodules
+${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README
+${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodules
        rm -rf ${KERNEL_SRC}
        cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
@@ -233,14 +240,12 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNEL_SRC_SUBMODULE} | submodules
        #cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
        cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
        cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../openvswitch-Set-internal-device-max-mtu-to-ETH_MAX_M.patch
        cd ${KERNEL_SRC}; patch -p1 < ../0001-netfilter-nft_set_rbtree-handle-re-addition-element-.patch # DoS from within (unpriv) containers
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-8890-dccp-tcp-do-not-inherit-mc_list-from-parent.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-9074-ipv6-Prevent-overrun-when-parsing-v6-header-options.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-9074-2-ipv6-Check-ip6_find_1stfragopt-return-value-properly.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-9075-sctp-do-not-inherit-ipv6_-mc-ac-fl-_list-from-parent.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-9076_9077-ipv6-dccp-do-not-inherit-ipv6_mc_list-from-parent.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-9242-ipv6-fix-out-of-bound-writes-in-__ip6_append_data.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-1000364-mm-mmap.c-do-not-blow-on-PROT_NONE-MAP_FIXED-holes-i.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-1000364-mm-mmap.c-expand_downwards-don-t-require-the-gap-if-.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-1000365-fs-exec.c-account-for-argv-envp-pointers.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-10810-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-7482-rxrpc-Fix-several-cases-where-a-padded-len-isn-t-che.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -274,7 +279,8 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
-${SPL_MODULES}: .compile_mark ${SPLSRC}
+$(SPL_KO_REST): $(SPL_KO)
+$(SPL_KO): .compile_mark ${SPLSRC}
        rm -rf ${SPLDIR}
        tar xf ${SPLSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
@@ -284,7 +290,8 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC}
        cp ${SPLDIR}/module/spl/spl.ko spl.ko
        cp ${SPLDIR}/module/splat/splat.ko splat.ko
 
-${ZFS_MODULES}: .compile_mark ${ZFSSRC}
+$(ZFS_KO_REST): $(ZFS_KO)
+$(ZFS_KO): .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
@@ -301,7 +308,8 @@ ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
 headers_tmp := $(CURDIR)/tmp-headers
 headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
 
-${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
+hdr: $(HDR_DEB)
+${HDR_DEB}: .compile_mark headers-control.in headers-postinst.in
        rm -rf $(headers_tmp)
        install -d $(headers_tmp)/DEBIAN $(headers_dir)/include/
        sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' -e 's/@ARCH@/${ARCH}/' <headers-control.in >$(headers_tmp)/DEBIAN/control