* Michael Jeanson <mjean...@ubuntu.com> wrote:
> Hi,
> 
> Here is a debdiff against the current package fixing the build
> failure, I'll ask Jon to make a new upload.

Hey Michael,

I just attempted a build with your diff and I'm seeing the attached
errors.  It looks like the debian-specific ifdefs are not quite right,
does any of this look familiar?  I'll look at it closer over the holiday
if you don't get to it sooner.

Cheers,

-- 
Jon
DKMS make.log for lttng-modules-2.5.1 for kernel 3.16.0-4-amd64 (x86_64)
Fri Jul  1 20:22:45 GMT 2016
make: Entering directory '/usr/src/linux-headers-3.16.0-4-amd64'
Makefile:10: *** mixed implicit and normal rules: deprecated syntax
make[1]: Entering directory `/usr/src/linux-headers-3.16.0-4-amd64'
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-client-discard.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-client-overwrite.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-metadata-client.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-client-mmap-discard.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-client-mmap-overwrite.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lttng-ring-buffer-metadata-mmap-client.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-statedump-impl.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/wrapper/irqdesc.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/wrapper/fdtable.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-events.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-abi.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-probes.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-pid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-procname.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-prio.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-nice.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-vpid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-tid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-vtid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-ppid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-vppid.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-calibrate.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-hostname.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/wrapper/random.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-syscalls.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-user.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-context-perf-counters.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-tracepoint.o
  LD [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-tracer.o
  LD [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lttng-statedump.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_backend.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_frontend.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_iterator.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_vfs.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_splice.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/ringbuffer/ring_buffer_mmap.o
  CC [M]  
/var/lib/dkms/lttng-modules/2.5.1/build/lib/prio_heap/lttng_prio_heap.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lib/../wrapper/splice.o
  LD [M]  /var/lib/dkms/lttng-modules/2.5.1/build/lib/lttng-lib-ring-buffer.o
/var/lib/dkms/lttng-modules/2.5.1/build/probes/Makefile:30: File 
/usr/src/linux-headers-3.16.0-4-common/virt/kvm/iodev.h not found. Probe "kvm" 
x86-specific is disabled. Use full kernel source tree to enable it.
/var/lib/dkms/lttng-modules/2.5.1/build/probes/Makefile:142: Files 
/usr/src/linux-headers-3.16.0-4-common/fs/btrfs/*.h not found. Probe "btrfs" is 
disabled. Use full kernel source tree to enable it.
/var/lib/dkms/lttng-modules/2.5.1/build/probes/Makefile:158: Files 
/usr/src/linux-headers-3.16.0-4-common/fs/ext4/*.h not found. Probe "ext4" is 
disabled. Use full kernel source tree to enable it.
/var/lib/dkms/lttng-modules/2.5.1/build/probes/Makefile:214: 
CONFIG_KALLSYMS_ALL is disabled, therefore probe "writeback" is disabled. 
Rebuild your kernel with this configuration option enabled in order to trace 
this subsystem.
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-sched.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-types.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-irq.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-timer.o
  CC [M]  /var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-kmem.o
In file included from 
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:139:0,
                 from 
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/kmem.h:380,
                 from 
/var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-kmem.c:42:
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:151:6:
 error: conflicting types for ‘trace_mm_page_alloc_extfrag’
 void trace_##_name(_proto);
      ^
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:47:2:
 note: in expansion of macro ‘DEFINE_EVENT_MAP’
  DEFINE_EVENT_MAP(map, name, map, PARAMS(proto), PARAMS(args))
  ^
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:89:2:
 note: in expansion of macro ‘TRACE_EVENT_MAP’
  TRACE_EVENT_MAP(name, name,    \
  ^
/var/lib/dkms/lttng-modules/2.5.1/build/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/kmem.h:291:1:
 note: in expansion of macro ‘TRACE_EVENT’
 TRACE_EVENT(mm_page_alloc_extfrag,
 ^
In file included from 
/usr/src/linux-headers-3.16.0-4-common/include/trace/events/kmem.h:8:0,
                 from 
/var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-kmem.c:31:
/usr/src/linux-headers-3.16.0-4-common/include/linux/tracepoint.h:163:21: note: 
previous definition of ‘trace_mm_page_alloc_extfrag’ was here
  static inline void trace_##name(proto)    \
                     ^
/usr/src/linux-headers-3.16.0-4-common/include/linux/tracepoint.h:270:3: note: 
in expansion of macro ‘__DECLARE_TRACE’
   __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), 1, \
   ^
/usr/src/linux-headers-3.16.0-4-common/include/linux/tracepoint.h:404:2: note: 
in expansion of macro ‘DECLARE_TRACE’
  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
  ^
/usr/src/linux-headers-3.16.0-4-common/include/trace/events/kmem.h:267:1: note: 
in expansion of macro ‘TRACE_EVENT’
 TRACE_EVENT(mm_page_alloc_extfrag,
 ^
/usr/src/linux-headers-3.16.0-4-common/scripts/Makefile.build:268: recipe for 
target '/var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-kmem.o' 
failed
make[4]: *** 
[/var/lib/dkms/lttng-modules/2.5.1/build/probes/lttng-probe-kmem.o] Error 1
/usr/src/linux-headers-3.16.0-4-common/scripts/Makefile.build:409: recipe for 
target '/var/lib/dkms/lttng-modules/2.5.1/build/probes' failed
make[3]: *** [/var/lib/dkms/lttng-modules/2.5.1/build/probes] Error 2
/usr/src/linux-headers-3.16.0-4-common/Makefile:1352: recipe for target 
'_module_/var/lib/dkms/lttng-modules/2.5.1/build' failed
make[2]: *** [_module_/var/lib/dkms/lttng-modules/2.5.1/build] Error 2
Makefile:181: recipe for target 'sub-make' failed
make[1]: *** [sub-make] Error 2
Makefile:8: recipe for target 'all' failed
make: *** [all] Error 2
make: Leaving directory '/usr/src/linux-headers-3.16.0-4-amd64'

Reply via email to