Hi

The patch was against upstream git aka 0.1.95. Sorry, I forgot to check against 
the version in Debian. Can you try upstream?

git clone, cd sysdig, mkdir build, cd build, cmake .., make

Should be sufficient.

I'll have a closer look at your log when not on 3g anymore.

Greets
Evgeni

On January 24, 2015 11:03:19 AM GMT+01:00, Martin Steigerwald 
<mar...@lichtvoll.de> wrote:
>Am Samstag, 24. Januar 2015, 08:23:19 schrieb Evgeni Golov:
>> Hi Martin
>
>Hi Evgeni,
>
>> On Tue, Jan 06, 2015 at 11:24:31AM +0100, Martin Steigerwald wrote:
>> > sysdig-dkms does not compile for 3.19-rc3:
>> > 
>> > DKMS make.log for sysdig-0.1.92 for kernel
>> > 3.19.0-rc2-tp520-trim-all-bgroups+ (x86_64) Di 6. Jan 11:23:12 CET
>> > 2015
>> > make: Entering directory
>> > '/home/martin/Computer/Merkaba/Kernel/linux.git'> 
>> >   LD      /var/lib/dkms/sysdig/0.1.92/build/built-in.o
>> >   CC [M]  /var/lib/dkms/sysdig/0.1.92/build/main.o
>> > 
>> > /var/lib/dkms/sysdig/0.1.92/build/main.c: In function ‘ppm_open’:
>> > /var/lib/dkms/sysdig/0.1.92/build/main.c:199:27: error: ‘struct
>file’
>> > has no member named ‘f_dentry’> 
>> >   int ring_no = iminor(filp->f_dentry->d_inode);
>> 
>> Thanks for the report.
>> Can you try the attached patch? It works fine for my 3.16, but I
>don't
>> have a 3.19 tree to test with here.
>
>Thank you for the patch.
>
>Applied as:
>
>merkaba:/var/lib/dkms/sysdig/0.1.92/source> patch -p1 <
>/var/tmp/0001-f_dentry-was-droped-in-kernel-3.19-replace-it-with-t.patch
>can't find file to patch at input line 23
>Perhaps you used the wrong -p or --strip option?
>The text leading up to this was:
>--------------------------
>|From 0559bff6908ba079a69dd85d3122a308d32767e8 Mon Sep 17 00:00:00 2001
>|From: Evgeni Golov <evg...@debian.org>
>|Date: Thu, 22 Jan 2015 21:28:43 +0100
>|Subject: [PATCH] f_dentry was droped in kernel 3.19, replace it with
>the real
>| path
>|
>|struct file from linux/fs.h had a d_entry member up to kernel 2.6.18,
>|in 2.6.19 it was changed to f_path.dentry, with the compatibility
>macro.
>|
>|78d28e651f97866d608d9b41f8ad291e65d47dd5 droped the f_dentry macro.
>|One has to use f_path.dentry directly.
>|
>|Debian-Bug: https://bugs.debian.org/774693
>|---
>| driver/main.c        | 10 +++++-----
>| driver/ppm_fillers.c |  2 +-
>| 2 files changed, 6 insertions(+), 6 deletions(-)
>|
>|diff --git a/driver/main.c b/driver/main.c
>|index 3597277..dc452c4 100644
>|--- a/driver/main.c
>|+++ b/driver/main.c
>--------------------------
>File to patch: main.c
>patching file main.c
>Hunk #5 succeeded at 489 (offset -6 lines).
>can't find file to patch at input line 72
>Perhaps you used the wrong -p or --strip option?
>The text leading up to this was:
>--------------------------
>|diff --git a/driver/ppm_fillers.c b/driver/ppm_fillers.c
>|index 91a6c26..5417772 100644
>|--- a/driver/ppm_fillers.c
>|+++ b/driver/ppm_fillers.c
>--------------------------
>File to patch: ppm_fillers.c
>patching file ppm_fillers.c
>Hunk #1 succeeded at 1866 (offset -44 lines).
>
>
>
>Building gives:
>
>merkaba:~> dkms build sysdig/0.1.92
>
>Kernel preparation unnecessary for this kernel.  Skipping...
>
>Building module:
>cleaning build area....
>make KERNELRELEASE=3.19.0-rc5-tp520-trim-all-bgroups+ -C
>/lib/modules/3.19.0-rc5-tp520-trim-all-bgroups+/build
>M=/var/lib/dkms/sysdig/0.1.92/build.....(bad exit status: 2)
>Error! Bad return status for module build on kernel:
>3.19.0-rc5-tp520-trim-all-bgroups+ (x86_64)
>Consult /var/lib/dkms/sysdig/0.1.92/build/make.log for more
>information.
>
>
>DKMS make.log for sysdig-0.1.92 for kernel
>3.19.0-rc5-tp520-trim-all-bgroups+ (x86_64)
>Sa 24. Jan 11:00:27 CET 2015
>make: Entering directory
>'/home/martin/Computer/Merkaba/Kernel/linux.git'
>  LD      /var/lib/dkms/sysdig/0.1.92/build/built-in.o
>  CC [M]  /var/lib/dkms/sysdig/0.1.92/build/main.o
>  CC [M]  /var/lib/dkms/sysdig/0.1.92/build/dynamic_params_table.o
>  CC [M]  /var/lib/dkms/sysdig/0.1.92/build/flags_table.o
>  CC [M]  /var/lib/dkms/sysdig/0.1.92/build/ppm_events.o
>  CC [M]  /var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.o
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c: In function
>‘f_sys_sendmsg_e’:
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1629:39: error: ‘struct
>msghdr’ has no member named ‘msg_iov’
>  iov = (const struct iovec __user *)mh.msg_iov;
>                                       ^
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1630:13: error: ‘struct
>msghdr’ has no member named ‘msg_iovlen’
>  iovcnt = mh.msg_iovlen;
>             ^
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c: In function
>‘f_sys_sendmsg_x’:
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1705:39: error: ‘struct
>msghdr’ has no member named ‘msg_iov’
>  iov = (const struct iovec __user *)mh.msg_iov;
>                                       ^
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1706:13: error: ‘struct
>msghdr’ has no member named ‘msg_iovlen’
>  iovcnt = mh.msg_iovlen;
>             ^
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c: In function
>‘f_sys_recvmsg_x’:
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1774:39: error: ‘struct
>msghdr’ has no member named ‘msg_iov’
>  iov = (const struct iovec __user *)mh.msg_iov;
>                                       ^
>/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.c:1775:13: error: ‘struct
>msghdr’ has no member named ‘msg_iovlen’
>  iovcnt = mh.msg_iovlen;
>             ^
>scripts/Makefile.build:257: recipe for target
>'/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.o' failed
>make[1]: *** [/var/lib/dkms/sysdig/0.1.92/build/ppm_fillers.o] Error 1
>Makefile:1382: recipe for target
>'_module_/var/lib/dkms/sysdig/0.1.92/build' failed
>make: *** [_module_/var/lib/dkms/sysdig/0.1.92/build] Error 2
>make: Leaving directory
>'/home/martin/Computer/Merkaba/Kernel/linux.git'
>
>
>Seems to need a further adaption. Are there no sysdig upstream patches
>available to build with 3.19?
>
>I used 0.1.92-1 from experimental, do you want me to try 0.1.89-1 from
>sid?
>
>Ciao,

-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to