GNU bug report logs - #40083
[PATCH] gnu: Add blktrace.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40083 in the body.
You can then email your comments to 40083 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add blktrace.
Date: Sun, 15 Mar 2020 21:52:18 +0100

[Message part 1 (text/plain, inline)]

Lightly tested on qemu VM, seems working OK

-- 
Vincent Legoll

[0001-gnu-Add-blktrace.patch (text/x-patch, attachment)]

Message #8 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40083 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: Add blktrace.
Date: Sun, 15 Mar 2020 22:00:22 +0100

The use of git instead of released tarball is to have the commit for
fixing CVE-2018-10689

-- 
Vincent Legoll

Message #11 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40083 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: Add blktrace.
Date: Sun, 15 Mar 2020 22:47:06 +0100

Dunno what to do about the packaged .py scripts, Should I patch the
shebang ? ("#! /usr/bin/env python") after adding python to inputs ?

On Sun, Mar 15, 2020 at 10:00 PM Vincent Legoll
<vincent.legoll <at> gmail.com> wrote:
>
> The use of git instead of released tarball is to have the commit for
> fixing CVE-2018-10689
>
> --
> Vincent Legoll



-- 
Vincent Legoll

Message #14 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Vincent Legoll <vincent.legoll <at> gmail.com>
Cc: 40083 <at> debbugs.gnu.org
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Thu, 19 Mar 2020 15:04:59 +0100

[Message part 1 (text/plain, inline)]

Hi!

Vincent Legoll <vincent.legoll <at> gmail.com> skribis:

> Dunno what to do about the packaged .py scripts, Should I patch the
> shebang ? ("#! /usr/bin/env python") after adding python to inputs ?

Just do something like this:

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d19c20d056..0822748968 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4036,7 +4036,8 @@ applications.")
          #:phases
          (modify-phases %standard-phases (delete 'configure)))) ; no configure script
       (inputs
-       `(("libaio" ,libaio)))
+       `(("libaio" ,libaio)
+         ("python" ,python-wrapper)))             ;for 'bno_plot.py'
       (synopsis "Block layer IO tracing mechanism")
       (description "Blktrace is a block layer IO tracing mechanism which provides
 detailed information about request queue operations to user space.  It extracts

[Message part 3 (text/plain, inline)]

and the .py files will be automatically patched.

However, ‘bno_plot.py’ refers to /bin/rm and gnuplot, and these
references should probably be replaced with absolute file names.

Could you take a look and send an updated patch?

Thanks,
Ludo’.

Message #17 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 40083 <at> debbugs.gnu.org
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Thu, 19 Mar 2020 16:05:07 +0100

Hello,

On Thu, Mar 19, 2020 at 3:05 PM Ludovic Courtès <ludo <at> gnu.org> wrote:
> Vincent Legoll <vincent.legoll <at> gmail.com> skribis:
>
> > Dunno what to do about the packaged .py scripts, Should I patch the
> > shebang ? ("#! /usr/bin/env python") after adding python to inputs ?
>
> Just do something like this:

[something's missing here] ;-)

> and the .py files will be automatically patched.
>
> However, ‘bno_plot.py’ refers to /bin/rm and gnuplot, and these
> references should probably be replaced with absolute file names.
>
> Could you take a look and send an updated patch?

I already have that patched out, replacing that rm call with pure
python code, I'll resubmit a new version correcting all those glitches
later.

Now's time for a bit of sunlight to placebo-help fight covid...

-- 
Vincent Legoll

Message #20 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Vincent Legoll <vincent.legoll <at> gmail.com>, Ludovic Courtès <ludo <at> gnu.org>
Cc: 40083 <at> debbugs.gnu.org
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Thu, 19 Mar 2020 16:48:21 +0100

[Message part 1 (text/plain, inline)]

Vincent Legoll <vincent.legoll <at> gmail.com> writes:

> Hello,
>
> On Thu, Mar 19, 2020 at 3:05 PM Ludovic Courtès <ludo <at> gnu.org> wrote:
>> Vincent Legoll <vincent.legoll <at> gmail.com> skribis:
>>
>> > Dunno what to do about the packaged .py scripts, Should I patch the
>> > shebang ? ("#! /usr/bin/env python") after adding python to inputs ?
>>
>> Just do something like this:
>
> [something's missing here] ;-)

Hm?  There is an inline patch.  It renders nicely in my mail client, as
well as on issues.guix.gnu.org:

https://issues.guix.gnu.org/issue/40083#3

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 40083 <at> debbugs.gnu.org, Ludovic Courtès <ludo <at> gnu.org>
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Thu, 19 Mar 2020 17:01:30 +0100

On Thu, Mar 19, 2020 at 4:48 PM Marius Bakke <mbakke <at> fastmail.com> wrote:
> Vincent Legoll <vincent.legoll <at> gmail.com> writes:
> > [something's missing here] ;-)
>
> Hm?  There is an inline patch.  It renders nicely in my mail client, as
> well as on issues.guix.gnu.org:
>
> https://issues.guix.gnu.org/issue/40083#3

Yes, I've seen it on the guix issues site, but gmail is not showing it
properly...

-- 
Vincent Legoll

Message #26 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 40083 <at> debbugs.gnu.org, Ludovic Courtès <ludo <at> gnu.org>
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Thu, 19 Mar 2020 18:25:34 +0100

[Message part 1 (text/plain, inline)]

Is that better ?

I intend to submit the rmtree patch (along a bunch of other cleanups)
to upstream, will update guix packaging when that will happen...

On Thu, Mar 19, 2020 at 5:01 PM Vincent Legoll <vincent.legoll <at> gmail.com> wrote:
>
> On Thu, Mar 19, 2020 at 4:48 PM Marius Bakke <mbakke <at> fastmail.com> wrote:
> > Vincent Legoll <vincent.legoll <at> gmail.com> writes:
> > > [something's missing here] ;-)
> >
> > Hm?  There is an inline patch.  It renders nicely in my mail client, as
> > well as on issues.guix.gnu.org:
> >
> > https://issues.guix.gnu.org/issue/40083#3
>
> Yes, I've seen it on the guix issues site, but gmail is not showing it
> properly...
>
> --
> Vincent Legoll



-- 
Vincent Legoll

[0001-gnu-Add-blktrace-v2.patch (text/x-patch, attachment)]

Message #31 received at 40083-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Vincent Legoll <vincent.legoll <at> gmail.com>
Cc: 40083-done <at> debbugs.gnu.org, Ludovic Courtès <ludo <at> gnu.org>
Subject: Re: [bug#40083] [PATCH] gnu: Add blktrace.
Date: Fri, 20 Mar 2020 18:35:50 +0100

[Message part 1 (text/plain, inline)]

Vincent Legoll <vincent.legoll <at> gmail.com> writes:

> Is that better ?

LGTM.

> I intend to submit the rmtree patch (along a bunch of other cleanups)
> to upstream, will update guix packaging when that will happen...

Great!

[...]
  
> +(define-public blktrace
> +  (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc")
> +        (revision "0"))

I added a comment about why we take this commit instead of the latest
tagged version.

[...]

> +           (add-after 'unpack 'fix-gnuplot-path
> +             (lambda* (#:key inputs #:allow-other-keys)
> +               (let ((gnuplot (assoc-ref inputs "gnuplot")))
> +                 (substitute* "btt/bno_plot.py"
> +                   (("gnuplot %s")
> +                    (string-append gnuplot "/bin/gnuplot %s")))))))))

...and ended this phase on a #t.

Applied!

[signature.asc (application/pgp-signature, inline)]

Message #34 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 40083 <at> debbugs.gnu.org
Subject: cleanups submitted upstream
Date: Fri, 20 Mar 2020 22:52:50 +0100

If/when the following series is merged, we will be able to remove the
local patch...

https://www.spinics.net/lists/linux-btrace/msg01154.html

-- 
Vincent Legoll

Message #37 received at 40083 <at> debbugs.gnu.org (full text, mbox):

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: guix-patches <at> gnu.org, 40083 <at> debbugs.gnu.org
Subject: [PATCH] gnu: blktrace: Update to db4f634.
Date: Sat, 21 Mar 2020 13:08:25 +0100

[Message part 1 (text/plain, inline)]

Wow, that was fast !

The cleanup series got applied instantly, in
retrospect, I should have done it before
submitting blktrace for inclusion in guix, it
would have caused less churn...

I incremented revision, is that the right
thing to do ?

-- 
Vincent Legoll

[0001-gnu-blktrace-Update-to-db4f634.patch (text/x-patch, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.