[kernel] r21887 - in dists/wheezy-backports/linux-tools: . debian debian/bin debian/build/scripts debian/build/scripts/mod debian/build/scripts/mod/real-lsb-32 debian/build/scripts/mod/real-lsb-64 debian/build/scripts/mod/real-msb-32 debian/build/scripts/mod/real-msb-64 debian/build/tools/perf debian/patches debian/templates
Ben Hutchings
benh at moszumanska.debian.org
Sun Sep 21 17:57:00 UTC 2014
Author: benh
Date: Sun Sep 21 17:57:00 2014
New Revision: 21887
Log:
Merge changes from sid up to 3.16-1
Added:
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/types.h
- copied unchanged from r21798, dists/sid/linux-tools/debian/build/scripts/mod/types.h
dists/wheezy-backports/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch
- copied unchanged from r21790, dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch
Modified:
dists/wheezy-backports/linux-tools/ (props changed)
dists/wheezy-backports/linux-tools/debian/bin/genorig.py
dists/wheezy-backports/linux-tools/debian/build/scripts/Makefile
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/Makefile.real
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-32/types.h
dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-64/types.h
dists/wheezy-backports/linux-tools/debian/build/tools/perf/Makefile
dists/wheezy-backports/linux-tools/debian/changelog
dists/wheezy-backports/linux-tools/debian/patches/series
dists/wheezy-backports/linux-tools/debian/rules.real
dists/wheezy-backports/linux-tools/debian/templates/control.main.in
dists/wheezy-backports/linux-tools/debian/templates/control.source.in
Modified: dists/wheezy-backports/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/bin/genorig.py Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/bin/genorig.py Sun Sep 21 17:57:00 2014 (r21887)
@@ -144,6 +144,7 @@
'arch/*/Makefile',
'arch/x86/lib/memcpy_64.S',
'arch/x86/lib/memset_64.S',
+ 'drivers/staging/usbip/uapi/',
'drivers/staging/usbip/userspace/',
'include/',
'lib/rbtree.c',
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/Makefile
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/Makefile Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/Makefile Sun Sep 21 17:57:00 2014 (r21887)
@@ -2,12 +2,14 @@
bin2c \
conmakehash \
kallsyms \
- pnmtologo
+ pnmtologo \
+ recordmcount
DATA = \
Kbuild.include \
Makefile.build \
Makefile.clean \
+ Makefile.extrawarn \
Makefile.host \
Makefile.lib \
Makefile.modinst \
@@ -32,6 +34,7 @@
mkuboot.sh \
namespace.pl \
patch-kernel \
+ recordmcount.pl \
setlocalversion \
ver_linux
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/Makefile.real
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/mod/Makefile.real Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/Makefile.real Sun Sep 21 17:57:00 2014 (r21887)
@@ -2,8 +2,6 @@
top_srcdir = ../..
-CFLAGS += -I$(top_srcdir)/include
-
include $(top_srcdir)/debian/build/Makefile.inc
modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
@@ -13,7 +11,7 @@
$(CC) -I real-$(TYPE) $(CFLAGS) -c -o $@ $<
real-$(TYPE)/devicetable-offsets.s: $(SOURCEDIR)/devicetable-offsets.c
- $(CC) -include real-$(TYPE)/types.h $(CFLAGS) -S -o $@ $<
+ $(CC) -include real-$(TYPE)/types.h $(CFLAGS) -nostdinc -I$(top_srcdir)/include -S -o $@ $<
real-$(TYPE)/devicetable-offsets.h: real-$(TYPE)/devicetable-offsets.s
echo >$@ "#define __DEVICEVTABLE_OFFSETS_H__"
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h Sun Sep 21 17:57:00 2014 (r21887)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
typedef __u32 kernel_ulong_t;
+#define BITS_PER_LONG 32
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h Sun Sep 21 17:57:00 2014 (r21887)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;
+#define BITS_PER_LONG 64
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-32/types.h
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-32/types.h Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-32/types.h Sun Sep 21 17:57:00 2014 (r21887)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
typedef __u32 kernel_ulong_t;
+#define BITS_PER_LONG 32
Modified: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-64/types.h
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-64/types.h Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/real-msb-64/types.h Sun Sep 21 17:57:00 2014 (r21887)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;
+#define BITS_PER_LONG 64
Copied: dists/wheezy-backports/linux-tools/debian/build/scripts/mod/types.h (from r21798, dists/sid/linux-tools/debian/build/scripts/mod/types.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy-backports/linux-tools/debian/build/scripts/mod/types.h Sun Sep 21 17:57:00 2014 (r21887, copy of r21798, dists/sid/linux-tools/debian/build/scripts/mod/types.h)
@@ -0,0 +1,6 @@
+/* Minimal definitions for mod_devicetable.h and devicetable-offsets.c */
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
+typedef unsigned long long __u64;
+#define offsetof(a,b) __builtin_offsetof(a,b)
Modified: dists/wheezy-backports/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/build/tools/perf/Makefile Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/build/tools/perf/Makefile Sun Sep 21 17:57:00 2014 (r21887)
@@ -21,6 +21,8 @@
KERNEL_ARCH_PERF = powerpc
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
KERNEL_ARCH_PERF = powerpc
+else ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
+ KERNEL_ARCH_PERF = powerpc
else ifeq ($(DEB_HOST_ARCH_CPU),s390)
KERNEL_ARCH_PERF = s390
else ifeq ($(DEB_HOST_ARCH_CPU),s390x)
@@ -33,13 +35,17 @@
KERNEL_ARCH_PERF = sparc
endif
-# disable Gtk UI until it's more usable
-MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=1 NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
+# - disable Gtk UI until it's more usable
+# - Include version in all directory names
+MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins NO_GTK2=1 NO_PERL=1 V=1 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
all:
ifdef KERNEL_ARCH_PERF
-mkdir out
- +$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out all VERSION=$(VERSION)
+# perf changes some default directories depending on whether DESTDIR is
+# set. We must define it even when building to avoid a rebuild when we
+# run 'make install'.
+ +$(MAKE_PERF) -C $(top_srcdir)/tools/perf -f Makefile.perf O=$(CURDIR)/out all VERSION=$(VERSION) DESTDIR=dummy
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation O=$(CURDIR)/out man VERSION=$(VERSION)
endif
Modified: dists/wheezy-backports/linux-tools/debian/changelog
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/changelog Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/changelog Sun Sep 21 17:57:00 2014 (r21887)
@@ -1,9 +1,48 @@
-linux-tools (3.14-1~bpo70+1) wheezy-backports; urgency=low
+linux-tools (3.16-2~bpo70+1) wheezy-backports; urgency=low
* Rebuild for wheezy
- Replace build-dependency on libunwind8-dev with libunwind7-dev
- -- Ben Hutchings <ben at decadent.org.uk> Wed, 14 May 2014 13:00:25 +0100
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Sep 2014 16:24:30 +0100
+
+linux-tools (3.16-2) unstable; urgency=medium
+
+ * linux-kbuild: Change the type headers used for devicetable-offsets.c
+ to avoid depending on UAPI headers or <linux/types.h>. This really
+ closes: #754213. It also fixes modpost handling of input device IDs
+ when host and target have differing word size.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 09 Sep 2014 13:21:05 +0100
+
+linux-tools (3.16-1) unstable; urgency=medium
+
+ * New upstream release
+
+ [ Mauricio Faria de Oliveira ]
+ * [ppc64el] Build linux-tools binary package (Closes: #754213)
+
+ [ Ben Hutchings ]
+ * linux-kbuild: Build and install recordmcount and recordmcount.pl,
+ needed for kernels with DYNAMIC_FTRACE enabled
+ * linux-kbuild: Fix recordmcount dependency for OOT modules
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 08 Sep 2014 18:45:06 +0100
+
+linux-tools (3.16~rc7-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * genorig: Include new directory for usbip UAPI header
+ * debian/control: Update Build-Depends for usbip switching from
+ libsysfs to libudev
+ * perf: Build with V=1 as V=2 no longer works
+ * perf: Change build command to avoid a rebuild during 'make install'
+ * linux-tools: Install traceevent plugins in
+ /usr/lib/traceevent_<version>/plugins (Closes: #756429)
+ * linux-kbuild: Install scripts/Makefile.extrawarn
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 29 Jul 2014 21:11:10 +0100
linux-tools (3.14-1) unstable; urgency=medium
Copied: dists/wheezy-backports/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch (from r21790, dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/wheezy-backports/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch Sun Sep 21 17:57:00 2014 (r21887, copy of r21790, dists/trunk/linux-tools/debian/patches/kbuild-fix-recordmcount-dependency.patch)
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: kbuild: Fix recordmcount dependency for OOT modules
+Date: Mon, 08 Sep 2014 18:31:24 +0100
+
+We never rebuild anything in-tree when building an out-of-tree
+modules, so external modules should not depend on the recordmcount
+sources.
+
+--- a/scripts/Makefile.build
++++ b/scripts/Makefile.build
+@@ -240,6 +240,11 @@ cmd_record_mcount = \
+ fi;
+ endif
+
++# Don't require recordmcount source for an OOT build.
++ifdef KBUILD_EXTMOD
++recordmcount_source :=
++endif
++
+ define rule_cc_o_c
+ $(call echo-cmd,checksrc) $(cmd_checksrc) \
+ $(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
Modified: dists/wheezy-backports/linux-tools/debian/patches/series
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/patches/series Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/patches/series Sun Sep 21 17:57:00 2014 (r21887)
@@ -2,3 +2,4 @@
tools-perf-version.patch
tools-perf-install.patch
usbip-document-tcp-wrappers.patch
+kbuild-fix-recordmcount-dependency.patch
Modified: dists/wheezy-backports/linux-tools/debian/rules.real
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/rules.real Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/rules.real Sun Sep 21 17:57:00 2014 (r21887)
@@ -9,7 +9,7 @@
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 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
+ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-tools
endif
Modified: dists/wheezy-backports/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/templates/control.main.in Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/templates/control.main.in Sun Sep 21 17:57:00 2014 (r21887)
@@ -7,7 +7,7 @@
Package: linux-tools- at version@
Section: devel
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64
+Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
Recommends: linux-base (>= 3.4~)
Suggests: linux-doc- at version@
Modified: dists/wheezy-backports/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/templates/control.source.in Sun Sep 21 14:23:16 2014 (r21886)
+++ dists/wheezy-backports/linux-tools/debian/templates/control.source.in Sun Sep 21 17:57:00 2014 (r21887)
@@ -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], libperl-dev, libunwind7-dev [amd64 i386], python-dev, xmlto,
- autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev
+ 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, libunwind7-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/
More information about the Kernel-svn-changes
mailing list