generate a linux-tool-4.2 package including perf tool

compatible with linux-base package

diff --git a/Makefile b/Makefile
index a905e67e9d033f2fd1275fb65cfe8b516cfe9912..5dc101de6dea6a8afb54c6464723f4fcc1bb3512 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,10 @@ HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 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
@@ -132,6 +135,19 @@ ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.D
        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
@@ -205,6 +221,8 @@ PVE_CONFIG_OPTS= \
        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} 
@@ -400,16 +418,17 @@ ${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} 
+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
 
@@ -419,7 +438,7 @@ distclean: clean
 
 .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}
 
 
 

diff --git a/control.tools b/control.tools
new file mode 100644 (file)
index 0000000..f5a4d10
--- /dev/null
+++ b/control.tools
@@ -0,0 +1,12 @@
+Source: pve-kernel
+Maintainer: Proxmox Support Team <support@proxmox.com>
+
+Package: linux-tools-4.2
+Architecture: amd64
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-base
+Description: Linux kernel version specific tools for version 4.2
+ This package provides the architecture dependant parts for kernel
+ version locked tools (such as perf and x86_energy_perf_policy)
+ 
\ No newline at end of file