[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771340: marked as done (linux-tools-3.16: perf not built for arm64)

Your message dated Tue, 03 Feb 2015 01:33:42 +0000
with message-id <E1YISN4-0004sn-HC@franck.debian.org>
and subject line Bug#771340: fixed in linux-tools 3.16-3
has caused the Debian Bug report #771340,
regarding linux-tools-3.16: perf not built for arm64
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771340: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771340
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: linux-tools-3.16
Severity: important
Tags: patch

Dear Maintainer,

For arm64, perf is not being built for Jessie.

I have attached a patch which works for me on a Juno board.

A kernel patch is cherry-picked to fix a perf build bug (this only
affects the arm64 tree).

Also, I have modified the build-dep to explicitly pull in binutils-dev.
(I found that both binutils-dev and libiberty are needed for C++
demangling support).

Some other build logic is altered in particular the architectures list
is now set to: linux-any; and the install-tools rule is now an
unconditional dependency for binary-arch, this took me *ages* to
find :-(.

Please let me know if I've missed anything obvious or you would like me
to run additional tests.

Cheers,
-- 
Steve

diff -Nru linux-tools-3.16/debian/build/tools/perf/Makefile linux-tools-3.16/debian/build/tools/perf/Makefile
--- linux-tools-3.16/debian/build/tools/perf/Makefile	2014-09-09 05:06:33.000000000 +0000
+++ linux-tools-3.16/debian/build/tools/perf/Makefile	2014-11-28 14:08:45.000000000 +0000
@@ -12,6 +12,8 @@
   NO_LIBUNWIND=
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
+else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
+  KERNEL_ARCH_PERF = arm64
 else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
diff -Nru linux-tools-3.16/debian/control linux-tools-3.16/debian/control
--- linux-tools-3.16/debian/control	2014-09-09 12:23:52.000000000 +0000
+++ linux-tools-3.16/debian/control	2014-11-28 15:09:07.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Jonathan Nieder <jrnieder@gmail.com>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>> 7), python, asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto, autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev
+Build-Depends: debhelper (>> 7), python, asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev, binutils-dev, libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto, autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/
 
@@ -17,7 +17,7 @@
 Multi-Arch: foreign
 
 Package: linux-tools-3.16
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
+Architecture: linux-any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 3.4~)
diff -Nru linux-tools-3.16/debian/control.md5sum linux-tools-3.16/debian/control.md5sum
--- linux-tools-3.16/debian/control.md5sum	2014-09-09 12:23:52.000000000 +0000
+++ linux-tools-3.16/debian/control.md5sum	2014-11-28 15:09:07.000000000 +0000
@@ -1,4 +1,4 @@
 ac3acacf0cde6d2cc424f28241bb0857  debian/bin/gencontrol.py
 e22c0d8272eb6d18751657807e50bc3f  debian/changelog
-d85b23bb34d1fc562998ab0c6117ff28  debian/templates/control.main.in
-96d01c999dbb871c3c6fecaad4b4901c  debian/templates/control.source.in
+6167d5526bfd33090891989b0ab3d9ff  debian/templates/control.main.in
+39974d9874415912d0e40cef24b78c46  debian/templates/control.source.in
diff -Nru linux-tools-3.16/debian/patches/fix-arm64-build.patch linux-tools-3.16/debian/patches/fix-arm64-build.patch
--- linux-tools-3.16/debian/patches/fix-arm64-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ linux-tools-3.16/debian/patches/fix-arm64-build.patch	2014-11-28 16:16:52.000000000 +0000
@@ -0,0 +1,44 @@
+From: Steve Capper <steve.capper@linaro.org>
+Date: Fri, 28 Nov 2014 16:15:00 +0000
+Subject: Cherry-pick perf fix for arm64
+
+This is a cherry-pick of the following commit, needed for perf to build
+on arm64.
+
+commit 7d885749b6de2c9a1168d566e2380207b9177108
+Author: Mark Salter <msalter@redhat.com>
+Commit: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+    perf tools: Fix arm64 build error
+    
+    I'm seeing the following build error on arm64:
+    
+      In file included from util/event.c:3:0:
+      util/event.h:95:17: error: 'PERF_REGS_MAX' undeclared here (not in a function)
+        u64 cache_regs[PERF_REGS_MAX];
+                     ^
+    
+    This patch adds a PERF_REGS_MAX definition for arm64.
+    
+    Signed-off-by: Mark Salter <msalter@redhat.com>
+    Acked-by: Jean Pihet <jean.pihet@linaro.org>
+    Cc: Ingo Molnar <mingo@redhat.com>
+    Cc: Jean Pihet <jean.pihet@linaro.org>
+    Cc: Paul Mackerras <paulus@samba.org>
+    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
+    Link: http://lkml.kernel.org/r/1406325766-8085-1-git-send-email-msalter@redhat.com
+    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+
+Index: linux-tools-3.16/tools/perf/arch/arm64/include/perf_regs.h
+===================================================================
+--- linux-tools-3.16.orig/tools/perf/arch/arm64/include/perf_regs.h
++++ linux-tools-3.16/tools/perf/arch/arm64/include/perf_regs.h
+@@ -6,6 +6,7 @@
+ #include <asm/perf_regs.h>
+ 
+ #define PERF_REGS_MASK	((1ULL << PERF_REG_ARM64_MAX) - 1)
++#define PERF_REGS_MAX	PERF_REG_ARM64_MAX
+ #define PERF_REG_IP	PERF_REG_ARM64_PC
+ #define PERF_REG_SP	PERF_REG_ARM64_SP
+ 
diff -Nru linux-tools-3.16/debian/patches/series linux-tools-3.16/debian/patches/series
--- linux-tools-3.16/debian/patches/series	2014-09-08 22:32:53.000000000 +0000
+++ linux-tools-3.16/debian/patches/series	2014-11-28 14:18:51.000000000 +0000
@@ -3,3 +3,4 @@
 tools-perf-install.patch
 usbip-document-tcp-wrappers.patch
 kbuild-fix-recordmcount-dependency.patch
+fix-arm64-build.patch
diff -Nru linux-tools-3.16/debian/rules.real linux-tools-3.16/debian/rules.real
--- linux-tools-3.16/debian/rules.real	2014-09-08 22:32:53.000000000 +0000
+++ linux-tools-3.16/debian/rules.real	2014-11-28 15:39:07.000000000 +0000
@@ -8,10 +8,7 @@
 # includes any binNMU part.
 VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 
-binary-arch: install-kbuild install-usbip
-ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
-  binary-arch: install-tools
-endif
+binary-arch: install-kbuild install-usbip install-tools
 
 build: $(STAMPS_DIR)/build
 
diff -Nru linux-tools-3.16/debian/templates/control.main.in linux-tools-3.16/debian/templates/control.main.in
--- linux-tools-3.16/debian/templates/control.main.in	2014-09-08 22:32:53.000000000 +0000
+++ linux-tools-3.16/debian/templates/control.main.in	2014-11-28 14:55:53.000000000 +0000
@@ -7,7 +7,7 @@
 
 Package: linux-tools-@version@
 Section: devel
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 3.4~)
 Suggests: linux-doc-@version@
diff -Nru linux-tools-3.16/debian/templates/control.source.in linux-tools-3.16/debian/templates/control.source.in
--- linux-tools-3.16/debian/templates/control.source.in	2014-09-08 22:32:53.000000000 +0000
+++ linux-tools-3.16/debian/templates/control.source.in	2014-11-28 15:00:53.000000000 +0000
@@ -6,7 +6,7 @@
 Standards-Version: 3.9.4
 Build-Depends:
  debhelper (>> 7), python,
- asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto,
+ asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev, binutils-dev, libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto,
  autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/

--- End Message ---
--- Begin Message --- 
Source: linux-tools
Source-Version: 3.16-3

We believe that the bug you reported is fixed in the latest version of
linux-tools, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 771340@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ben Hutchings <ben@decadent.org.uk> (supplier of updated linux-tools package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 02 Feb 2015 22:05:59 +0000
Source: linux-tools
Binary: linux-kbuild-3.16 linux-tools-3.16 libusbip-dev usbip
Architecture: i386 source
Version: 3.16-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Changed-By: Ben Hutchings <ben@decadent.org.uk>
Closes: 763002 771340
Description: 
 libusbip-dev - USB device sharing system over IP network (development files)
 linux-kbuild-3.16 - Kbuild infrastructure for Linux 3.16
 linux-tools-3.16 - Performance analysis tools for Linux 3.16
 usbip      - USB device sharing system over IP network
Changes:
 linux-tools (3.16-3) unstable; urgency=medium
 .
   * linux-tools: Fix build configuration to avoid linking perf with libbfd
     (Closes: #763002)
   * linux-tools: Add a check that perf is not linked with libbfd
   * [arm64] Enable building linux-tools, thanks to Steve Capper
     (Closes: #771340)
Checksums-Sha1: 
 27cc79c86eca6763f17d6f1cbc5b23f0949e3a6e 2564 linux-tools_3.16-3.dsc
 69332d10292d0bace765e4c966281494c8d8d32e 23456 linux-tools_3.16-3.debian.tar.xz
 9eb3afa6f374b6ea1bbc49ccb8b04722eaf58bea 23368 libusbip-dev_2.0+3.16-3_i386.deb
 ff9df8bff382a7c33ac662ebc3177eeef39127de 177078 linux-kbuild-3.16_3.16-3_i386.deb
 c6bdbea3bab1f29c7be2d6330861abaa49ef5423 37214 usbip_2.0+3.16-3_i386.deb
 6e767a698b37e6f85c81744a3793ebe1950bc65f 603564 linux-tools-3.16_3.16-3_i386.deb
Checksums-Sha256: 
 bcfa34a4208c84c338c52a297c92ea866f9a0e8e657b8b608891224e31cd81ae 2564 linux-tools_3.16-3.dsc
 069072152bac7e3cf1f269a0b2c42c88ea23002769072abd00239c8de0efae2a 23456 linux-tools_3.16-3.debian.tar.xz
 6dfc06869846b3354dcb0f3d749e5903254f3b2572f7176733d7b8aa461465c0 23368 libusbip-dev_2.0+3.16-3_i386.deb
 4a172a42fc2c5ea126c12767127428d64c6dd45cc82a4af44d6b7cea255636df 177078 linux-kbuild-3.16_3.16-3_i386.deb
 6c157bc02372e068116ca91ab36fc9310488f4c73b816097716d41620a6e93d4 37214 usbip_2.0+3.16-3_i386.deb
 9a5ec00aaf0a35f329f78fb440d7dac1718c4a5d2259b82d26ffc5d656c68121 603564 linux-tools-3.16_3.16-3_i386.deb
Files: 
 af3f15f74a86e1891261cfaca2b3a716 2564 kernel optional linux-tools_3.16-3.dsc
 b457c81c360ec0a85f3fe949c898cc71 23456 kernel optional linux-tools_3.16-3.debian.tar.xz
 3c9eaa369bf40dca2b453809d57b8549 23368 libdevel optional libusbip-dev_2.0+3.16-3_i386.deb
 35970824669218528bc6ae9d8337ebba 177078 kernel optional linux-kbuild-3.16_3.16-3_i386.deb
 e6caf90661e9e36793afcad1517ba241 37214 admin optional usbip_2.0+3.16-3_i386.deb
 683133a9421e744111dfab76efbbbcd2 603564 devel optional linux-tools-3.16_3.16-3_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIVAwUBVNAkG+e/yOyVhhEJAQqtYw//aiCRJ/3YcVqat1TOBIsOLYPPJWXaENW3
4SpoPdPQzyKOlIpg327s0Jf/jFzyGAgNxTvSuU9g39cJFUSPDB5xBd5etc4tPpG0
0AzMvQQMQTQ3yDBiCPGTLglkwTJUINbK04umHLJ36k0oHfiliNlsrFnUyLyrDp1D
Z+UT/qVSf9L2ybXUqAlqAocJY6KzjWrAijFqDNkOmiU/Hsx+9IKpQdiK2eulbaQ4
apfUoU4JBFJhVe+oeiPKwybOraWmt3wMgNxzUWsVCmH1Mn6qWZk+xuLNCv2vpbdk
BbX6OXv451s/McpfW6PQb7/M5pRZlh9ByzxO9kLu/ZfLFQ4sHpSuYcVkEuhHEu1p
9JvCCvHX+UUWvA2OKw/Ereu7ryusOuldtZwB9q7ToLmhN9mg0Zx72xVBiMlPABIM
T0nw4Ma+JDHciwEG/gIq81MzmJxz+kYgd1le+a3I0cxsfsbSVuQNnAlokz+bA7Uy
9kPAHJ0okRgnG59L0pFzLcNRYUNhOhoaUN8IUPvxendcx97f5om9goTnonAxCV4e
mDZr+iDPKHZiAwnG7vrXbCucusVJzfvtyEU/fWtOUEXVMO/JhajWFC5JyPze6GVa
1oiIq8vFctJrFxts6WUoDGpA6G3XYONRpOltSOC4UipGzW+NQPQ8WdqLxSz/Lb+C
NkcmO6Wo6zM=
=AtyM
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: