setup kernel links for installation CD (rescue boot)

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 5dc101de6dea6a8afb54c6464723f4fcc1bb3512..cd95a3d72e2a23dc2499be4bc97d24db4ebe74df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.1
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
 KERNEL_VER=4.2.6
-PKGREL=26
+PKGREL=31
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -94,7 +94,9 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
        install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
        sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
-       install -m 0755 proxmox-ve/postinst proxmox-ve/data/DEBIAN/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
        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}
@@ -233,11 +235,28 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
-       #cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
+       cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
        #cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
        cd ${KERNEL_SRC}; patch -p1 <../kvmstealtime.patch
        cd ${KERNEL_SRC}; patch -p1 <../kvm-x86-obey-KVM_X86_QUIRK_CD_NW_CLEARED-in-kvm_set_cr0.patch
        cd ${KERNEL_SRC}; patch -p1 <../KVM-svm-unconditionally-intercept-DB.patch
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-socket-mediation.patch
+       cd ${KERNEL_SRC}; patch -p1 <../CVE-2015-8709-ptrace-require-mapped-uids-gids.patch
+       # backport aacraid update from kernel 4.4rc5
+       cd ${KERNEL_SRC}; patch -p1 <../0001-aacraid-fix-for-LD.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0002-aacraid-add-power-management.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0003-aacraid-change-interrupt-mode.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0004-aacraid-enable-64bit-write.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0005-aacraid-tune-response-path.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0006-aacraid-reset-irq-affinity.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0007-aacraid-ioctl-fix.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0008-aacraid-use-pci-enable-msix-range.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0009-aacraid-update-driver-version.patch
+       # backport MTTR kvm fixed (pci passthrough bug) from kernel 4.4rc7
+       cd ${KERNEL_SRC}; patch -p1 <../0001-mttr.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0002-mttr.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0003-mttr.patch
+
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@