Re: [PATCH] gnu: powertop: Patch absolute file names.

[Mark H Weaver <mhw@netris.org>]

Mathieu Lirzin <mthl@gnu.org> writes:

> * gnu/packages/linux.scm (powertop)[inputs]: Add kmod.
> [arguments]: Patch absolute file names.  Before that launching powertop
> was failing because 'modprobe' was not found.

By convention, we don't include rationales in the commit log.  When
needed, they should go in the source code, but in this case I don't
think it's needed, so I would just drop the last sentence above.

> ---
>  gnu/packages/linux.scm | 25 ++++++++++++++++++++++---
>  1 file changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index d554ecc..88afa8e 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -10,6 +10,7 @@
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
>  ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
>  ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
> +;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1202,11 +1203,29 @@ devices.  It replaces 'iwconfig', which is deprecated.")
>          (base32
>           "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8"))))
>      (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         ;; TODO: Patch some hardcoded "wlan0" in calibrate/calibrate.cpp to
> +         ;; allow calibrating the network interface in GuixSD.
> +         (add-after 'unpack 'patch-absolute-file-names
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let ((kmod (assoc-ref inputs "kmod")))
> +               (substitute* (find-files "src" ".*\\.cpp" )

Instead of ".*\\.cpp", it should be "\\.cpp$".  Also, please remove the
space before the close parenthesis.

> +                 (("/sbin/modprobe") (string-append kmod "/bin/modprobe"))
> +                 ;; These programs are only needed to calibrate, so using
> +                 ;; relative file names avoids adding extra inputs.  When they
> +                 ;; are missing powertop gracefully handle it.
> +                 (("/usr/bin/xset") "xset")

Shouldn't 'xset' be patched to use an absolute file name, as you did
with 'modprobe'?

> +                 (("/usr/sbin/hciconfig") "hciconfig") ;XXX:not packaged yet
> +                 (("/usr/bin/hcitool") "hcitool"))     ;XXX:not packaged yet
> +               #t))))))
>      (inputs
> -     `(("zlib" ,zlib)
> -       ("pciutils" ,pciutils)
> +     `(("kmod" ,kmod)
>         ("ncurses" ,ncurses)
> -       ("libnl" ,libnl)))
> +       ("pciutils" ,pciutils)
> +       ("libnl" ,libnl)
> +       ("zlib" ,zlib)))

Is there a reason that you rearranged these instead of simply adding
'kmod'?

      Thanks!
        Mark