]> git.proxmox.com Git - pve-kernel.git/blobdiff - Makefile
build-sys: replace fixed architecture use where possible
[pve-kernel.git] / Makefile
index 9d96a11b572582aa3d3e55eed2f6b612cd7548d0..556e6314f95a5e287d8babfb36534a3c04c82864 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.5
-PKGREL=5
+KERNEL_VER=4.10.8
+PKGREL=7
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -15,9 +15,10 @@ KVNAME=${KERNEL_VER}${EXTRAVERSION}
 PACKAGE=pve-kernel-${KVNAME}
 HDRPACKAGE=pve-headers-${KVNAME}
 
-ARCH=amd64
+ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate -lchangelog.Debian)
+export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp -lchangelog.Debian)
 
 SKIPABI=0
 
@@ -34,35 +35,6 @@ IGBSRC=${IGBDIR}.tar.gz
 IXGBEDIR=ixgbe-5.0.4
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-# does not compile with kernel 3.19.8
-#I40EDIR=i40e-1.2.38
-#I40ESRC=${I40EDIR}.tar.gz
-
-# looks up to date with kernel 3.19.8
-#BNX2DIR=netxtreme2-7.11.05
-#BNX2SRC=${BNX2DIR}.tar.gz
-
-# does not compile with kernel 3.19.8
-#AACRAIDVER=1.2.1-40700
-#AACRAIDDIR=aacraid-${AACRAIDVER}.src
-#AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
-
-# does not compile with kernel 3.19.8
-HPSAVER=3.4.8
-HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-140.tar.bz2
-
-# driver does not compile
-#MEGARAID_DIR=megaraid_sas-06.703.11.00
-#MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
-
-#ARECADIR=arcmsr-1.30.0X.19-140509
-#ARECASRC=${ARECADIR}.zip
-
-# this one does not compile with newer 3.10 kernels!
-#RR272XSRC=RR272x_1x-Linux-Src-v1.5-130325-0732.tar.gz
-#RR272XDIR=rr272x_1x-linux-src-v1.5
-
 SPLDIR=pkg-spl
 SPLSRC=submodules/zfs/pkg-spl.tar.gz
 ZFSDIR=pkg-zfs
@@ -70,12 +42,6 @@ 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
 
-# DRBD9
-#DRBDVER=9.0.6-1
-#DRBDDIR=drbd-${DRBDVER}
-#DRBDSRC=${DRBDDIR}.tar.gz
-#DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
-
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve
@@ -84,7 +50,7 @@ VIRTUALHDRPACKAGE=pve-headers
 VIRTUAL_HDR_DEB=${VIRTUALHDRPACKAGE}_${RELEASE}-${PKGREL}_all.deb
 
 LINUX_TOOLS_PKG=linux-tools-4.10
-LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
+LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB}
 
@@ -126,7 +92,7 @@ endif
 
 ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian | fwcheck abicheck
        mkdir -p data/DEBIAN
-       sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
+       sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' -e 's/@ARCH@/${ARCH}/' <control.in >data/DEBIAN/control
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <prerm.in >data/DEBIAN/prerm
        chmod 0755 data/DEBIAN/prerm
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <postinst.in >data/DEBIAN/postinst
@@ -189,13 +155,9 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES}
        install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
        # install latest e1000e driver
        install -m 644 e1000e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
-       ## install hpsa driver
-       #install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
        # install zfs drivers
        install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
        install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
-       # install drbd9
-       #install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd
        # remove firmware
        rm -rf tmp/lib/firmware
        # strip debug info
@@ -242,6 +204,7 @@ PVE_CONFIG_OPTS= \
 --set-str CONFIG_DEFAULT_SECURITY apparmor
 
 .compile_mark: ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cp ${KERNEL_CFG_ORG} ${KERNEL_SRC}/.config
        cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS}
        cd ${KERNEL_SRC}; make oldconfig
@@ -253,7 +216,7 @@ PVE_CONFIG_OPTS= \
 ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${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/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
+       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}
        cd ${KERNEL_SRC}; patch -p1 < ../uname-version-timestamp.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
@@ -264,79 +227,49 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNEL_SRC_SUBMODULE} | submodules
        cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
        cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
        cd ${KERNEL_SRC}; patch -p1 < ../openvswitch-Set-internal-device-max-mtu-to-ETH_MAX_M.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-7979-0002-net-sched-actions-allocate-act-cookie-early.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../swapops-0001-Revert-mm-ksm-handle-protnone-saved-writes-when-maki.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../swapops-0002-Revert-mm-ksm-convert-write_protect_page-to-use-page.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../swapops-0003-Revert-mm-introduce-page_vma_mapped_walk.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../swapops-0004-mm-ksm-handle-protnone-saved-writes-when-making-page.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
-aacraid.ko: .compile_mark ${AACRAIDSRC}
-       rm -rf ${AACRAIDDIR}
-       mkdir ${AACRAIDDIR}
-       cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
-       cd ${AACRAIDDIR};rpm2cpio aacraid-${AACRAIDVER}.src.rpm|cpio -i
-       cd ${AACRAIDDIR};tar xf aacraid_source.tgz
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} KSRC=${TOP}/${KERNEL_SRC} modules
-       cp ${AACRAIDDIR}/aacraid.ko .
-
-hpsa.ko hpsa: .compile_mark ${HPSASRC}
-       rm -rf ${HPSADIR}
-       tar xf ${HPSASRC}
-#      sed -i ${HPSADIR}/drivers/scsi/hpsa_kernel_compat.h -e 's/^\/\* #define RHEL7.*/#define RHEL7/'
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi KSRC=${TOP}/${KERNEL_SRC} modules
-       cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
-
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
        cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch
+       cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_max-mtu.patch
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
 igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        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}; patch -p1 < ../igb_4.10_max-mtu.patch
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
 ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch
+       cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_max-mtu.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}
-       rm -rf ${I40EDIR}
-       tar xf ${I40ESRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
-       cp ${I40EDIR}/src/i40e.ko i40e.ko
-
-bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
-       rm -rf ${BNX2DIR}
-       tar xf ${BNX2SRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
-       cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
-       cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
-
-arcmsr.ko: .compile_mark ${ARECASRC}
-       rm -rf ${ARECADIR}
-       mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
-       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-       cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} KSRC=${TOP}/${KERNEL_SRC} modules
-       cp ${ARECADIR}/arcmsr.ko arcmsr.ko
-
 ${SPL_MODULES}: .compile_mark ${SPLSRC}
        rm -rf ${SPLDIR}
        tar xf ${SPLSRC}
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cd ${SPLDIR}; ./autogen.sh
        cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
        cd ${SPLDIR}; make
@@ -346,6 +279,7 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC}
 ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
+       [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        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
@@ -356,35 +290,13 @@ ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
        cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
 
-#.PHONY: update-drbd
-#update-drbd:
-#      rm -rf ${DRBDDIR} ${DRBDSRC} drbd-9.0
-#      git clone --recursive git://git.drbd.org/drbd-9.0
-#      cd drbd-9.0; make tarball
-#      mv drbd-9.0/${DRBDSRC} ${DRBDSRC} 
-#
-#.PHONY: drbd
-#drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
-#      rm -rf ${DRBDDIR}
-#      tar xzf ${DRBDSRC}
-#      [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
-#      cd ${DRBDDIR}; make KVER=${KVNAME} KDIR=${TOP}/${KERNEL_SRC}
-#      mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
-#      mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
-
-#iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
-#      rm -rf ${ISCSITARGETDIR}
-#      tar xf ${ISCSITARGETSRC}
-#      cd ${ISCSITARGETDIR}; make KSRC=${TOP}/${KERNEL_SRC}
-#      cp ${ISCSITARGETDIR}/kernel/iscsi_trgt.ko iscsi_trgt.ko
-
 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
        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}/' <headers-control.in >$(headers_tmp)/DEBIAN/control
+       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
        sed -e 's/@@KVNAME@@/${KVNAME}/g'  <headers-postinst.in >$(headers_tmp)/DEBIAN/postinst
        chmod 0755 $(headers_tmp)/DEBIAN/postinst
        install -D -m 644 copyright $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/copyright