bump version to 4.4.16-65

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 5e9d434bd88920358fc10a65304ad32ddbab9eb8..4afdd02eb457ea7efe87a64f2a0bbba85aa61073 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=4.2
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
 KERNEL_VER=4.4.16
-PKGREL=61
+PKGREL=65
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -23,7 +23,7 @@ TOP=$(shell pwd)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
 FW_VER=1.1
-FW_REL=8
+FW_REL=9
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 E1000EDIR=e1000e-3.3.5
@@ -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.3-1
+DRBDVER=9.0.4-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -89,13 +89,18 @@ 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}
 
+PVE_RELEASE_KEYS=                              \
+       proxmox-ve/proxmox-release-4.x.pubkey   \
+       proxmox-ve/proxmox-release-5.x.pubkey
+
 all: check_gcc ${DEBS}
 
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
+${PVE_DEB} pve: 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}/
-       install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
+       mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d
+       gpg2 --no-default-keyring --keyring ./proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve.gpg --import ${PVE_RELEASE_KEYS}
        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
        sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
        chmod 0755 proxmox-ve/data/DEBIAN/postinst
@@ -261,6 +266,8 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 < ../watchdog_implement-mei-iamt-driver.patch
        cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch
        cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
+       #sd: Fix rw_max for devices that report an optimal xfer size
+       cd ${KERNEL_SRC}; patch -p1 < ../sd-fix-rw_max.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -410,7 +417,7 @@ dvb-firmware.git/README:
 linux-firmware.git/WHENCE:
        git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git linux-firmware.git
 
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-6-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-pve fwlist-4.2.8-1-pve fwlist-4.4.13-2-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-6-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-pve fwlist-4.2.8-1-pve fwlist-4.4.13-2-pve fwlist-4.4.16-1-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -430,6 +437,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        ./assemble-firmware.pl fwlist-3.19.8-1-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-4.2.8-1-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-4.4.13-2-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-4.4.16-1-pve fwdata/lib/firmware
        install -d fwdata/usr/share/doc/pve-firmware
        cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
        install -d fwdata/usr/share/doc/pve-firmware/licenses