# 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
PVEPKG=proxmox-ve
PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
-all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB}
+LINUX_TOOLS_PKG=linux-tools-4.2
+LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
+
+all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} ${LINUX_TOOLS_DEB}
${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
rm -rf proxmox-ve/data
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}
chmod 0755 data/DEBIAN/postrm
install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
- echo "git clone git://git.proxmox.com/git/pve-kernel-3.2.0.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
+ echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > data/usr/share/doc/${PACKAGE}/SOURCE
gzip -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian
rm -f data/lib/modules/${KVNAME}/source
rm -f data/lib/modules/${KVNAME}/build
dpkg-deb --build data ${DST_DEB}
lintian ${DST_DEB}
+LINUX_TOOLS_DH_LIST=strip installchangelogs installdocs compress shlibdeps gencontrol md5sums builddeb
+
+${LINUX_TOOLS_DEB}: .compile_mark control.tools changelog.Debian copyright
+ rm -rf linux-tools ${LINUX_TOOLS_DEB}
+ mkdir -p linux-tools/debian
+ cp control.tools linux-tools/debian/control
+ echo 9 > linux-tools/debian/compat
+ cp changelog.Debian linux-tools/debian/changelog
+ cp copyright linux-tools/debian
+ mkdir -p linux-tools/debian/linux-tools-4.2/usr/bin
+ install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.2/usr/bin/perf_4.2
+ cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done
+ lintian ${LINUX_TOOLS_DEB}
fwlist-${KVNAME}: data
./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS}
cd ${KERNEL_SRC}; make oldconfig
cd ${KERNEL_SRC}; make -j 8
+ make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
+ make -C ${KERNEL_SRC}/tools/perf man
touch $@
${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 $@
dpkg-deb --build fwdata ${FW_DEB}
.PHONY: upload
-upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB}
+upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_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/${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} /pve/${RELEASE}/extra
+ cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_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
.PHONY: clean
clean:
- rm -rf *~ .compile_mark watchdog-blacklist.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko
+ rm -rf *~ .compile_mark watchdog-blacklist.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC} ${KERNEL_SRC}.tmp ${KERNEL_CFG_ORG} ${KERNEL_SRC}.org orig tmp data proxmox-ve/data *.deb ${headers_tmp} fwdata fwlist.tmp *.ko fwlist-${KVNAME} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR} ${DRBDDIR} drbd-9.0 ${IGBDIR} igb.ko ${IXGBEDIR} ixgbe.ko ${E1000EDIR} e1000e.ko linux-tools ${LINUX_TOOLS_DEB}