X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=8c724fee5c5b9c9be44e7aeccfa355b052d18c50;hb=320f929d8c790eb5336b3847d45538fd8b7201a2;hp=f02e9e237bc8ed4335ea0787c9d9b6b2bd4b0608;hpb=28ebfe7277559ee43e2c696e5aefe53e4d3ab865;p=pve-kernel-jessie.git diff --git a/Makefile b/Makefile index f02e9e2..8c724fe 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ RELEASE=4.2 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL -KERNEL_VER=4.4.10 -PKGREL=54 +KERNEL_VER=4.4.16 +PKGREL=63 # also include firmware of previous version into # the fw package: fwlist-2.6.32-PREV-pve KREL=1 @@ -23,13 +23,13 @@ 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.3 +E1000EDIR=e1000e-3.3.5 E1000ESRC=${E1000EDIR}.tar.gz -IGBDIR=igb-5.3.4.4 +IGBDIR=igb-5.3.5.3 IGBSRC=${IGBDIR}.tar.gz IXGBEDIR=ixgbe-4.4.6 @@ -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 @@ -87,13 +87,20 @@ 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} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB} +DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB} -${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst +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_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/data/DEBIAN/control sed -e 's/@KVNAME@/${KVNAME}/' proxmox-ve/data/DEBIAN/postinst chmod 0755 proxmox-ve/data/DEBIAN/postinst @@ -120,7 +127,7 @@ ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control 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-24.43 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC} + git clone --single-branch -b Ubuntu-4.4.0-36.55 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC} tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} check_gcc: @@ -200,6 +207,7 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR mv tmp data PVE_CONFIG_OPTS= \ +-m INTEL_MEI_WDT \ -d CONFIG_SND_PCM_OSS \ -d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \ -d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \ @@ -253,6 +261,13 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} 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 < ../kvm-dynamic-halt-polling-disable-default.patch + cd ${KERNEL_SRC}; patch -p1 < ../ie31200_edac-add-skylake-support.patch + # avoid iAMT watchdog problems (not a real watchdog, because does not reset the host) + 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 $@ @@ -278,6 +293,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC} rm -rf ${E1000EDIR} tar xf ${E1000ESRC} [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + # patch used for igb and e1000e! + cd ${E1000EDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${E1000EDIR}/src/e1000e.ko e1000e.ko @@ -285,6 +302,8 @@ igb.ko igb: .compile_mark ${IGBSRC} rm -rf ${IGBDIR} tar xf ${IGBSRC} [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build + # patch used for igb and e1000e! + cd ${IGBDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${IGBDIR}/src/igb.ko igb.ko @@ -331,7 +350,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 @@ -388,6 +406,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} @@ -397,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-${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 @@ -416,6 +436,8 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README ./assemble-firmware.pl fwlist-3.10.0-8-pve fwdata/lib/firmware ./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 @@ -428,20 +450,8 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README dpkg-deb --build fwdata ${FW_DEB} .PHONY: upload -upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_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/${VIRTUALHDRPACKAGE}_*.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} ${VIRTUAL_HDR_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