debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from sid up to 3.12.6-3 

svn path=/dists/trunk/linux-tools/; revision=21027
This commit is contained in:
Ben Hutchings 2014-02-02 15:57:46 +00:00
parent 340374faca 8b0c975bb8
commit f5fafa860e
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/build/tools/perf/Makefile vendored
View File

@ -3,17 +3,20 @@ OUTDIR = tools/perf
include ../../Makefile.inc
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
NO_LIBUNWIND=1
ifeq ($(DEB_HOST_ARCH_CPU),alpha)
KERNEL_ARCH_PERF = alpha
else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
KERNEL_ARCH_PERF = x86_64
NO_LIBUNWIND=
else ifeq ($(DEB_HOST_ARCH_CPU),arm)
KERNEL_ARCH_PERF = arm
else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
KERNEL_ARCH_PERF = parisc
else ifeq ($(DEB_HOST_ARCH_CPU),i386)
KERNEL_ARCH_PERF = i386
NO_LIBUNWIND=
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
KERNEL_ARCH_PERF = powerpc
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)

9
debian/changelog vendored
View File

@ -4,6 +4,15 @@ linux-tools (3.13-1~exp1) experimental; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Sun, 02 Feb 2014 12:02:29 +0100
linux-tools (3.12.6-3) unstable; urgency=medium
* linux-tools: Explicitly enable/disable libunwind usage for all
architectures (fixes FTBFS on s390x and sparc)
* linux-tools: Only use libunwind on x86, as perf needs additional
porting work for other architectures (fixes FTBFS on arm and powerpc)
-- Ben Hutchings <ben@decadent.org.uk> Sun, 02 Feb 2014 16:46:44 +0100
linux-tools (3.12.6-2) unstable; urgency=medium
* linux-tools: Replace build-dependency on libunwind7-dev with

2
debian/templates/control.source.in vendored
View File

@ -6,7 +6,7 @@ Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>
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], libperl-dev, libunwind8-dev [amd64 armel armhf i386 mips powerpc ppc64], python-dev, xmlto,
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], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto,
autoconf, automake, libtool, libglib2.0-dev, libsysfs-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/