GNU bug report logs - #37054
[PATCH] gnu: wpa-supplicant: install documentation.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#37054: closed ([PATCH] gnu: wpa-supplicant: install
 documentation.)
Date: Fri, 16 Aug 2019 20:48:02 +0000

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

Your message dated Fri, 16 Aug 2019 22:47:12 +0200
with message-id <871rxkhm7j.fsf <at> gnu.org>
and subject line Re: [bug#37054] [PATCH] gnu: wpa-supplicant: install documentation.
has caused the debbugs.gnu.org bug report #37054,
regarding [PATCH] gnu: wpa-supplicant: install documentation.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
37054: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37054
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH] gnu: wpa-supplicant: install documentation.
Date: Fri, 16 Aug 2019 18:36:50 +0200

* gnu/packages/admin.scm (wpa-supplicant):
Install READMEs and the example config file.
---
wpa_supplicant.conf(5) does not explain all configuration options but
refers to the example config file, so install it along with READMEs.

 gnu/packages/admin.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bd3c14033e..0b97d96582 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1240,9 +1240,10 @@ commands and their arguments.")
       CONFIG_READLINE=y\n" port)
                (close-port port))
              #t))
-         (add-after 'install 'install-man-pages
+         (add-after 'install 'install-documentation
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
+                    (doc  (string-append out "/share/doc/wpa-supplicant"))
                     (man  (string-append out "/share/man"))
                     (man5 (string-append man "/man5"))
                     (man8 (string-append man "/man8")))
@@ -1255,6 +1256,11 @@ commands and their arguments.")
                          (find-files "doc/docbook" "\\.5"))
                (for-each (copy-man-page man8)
                          (find-files "doc/docbook" "\\.8"))
+
+               (for-each
+                (lambda (file) (install-file file doc))
+                '("README" "README-DPP" "README-HS20" "README-P2P" "README-WPS"
+                  "wpa_supplicant.conf"))
                #t))))
 
       #:make-flags (list "CC=gcc"
@@ -1303,7 +1309,7 @@ command.")
       CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port)
                  (close-port port))
                #t))
-          (add-after 'install-man-pages 'install-dbus-conf
+          (add-after 'install-documentation 'install-dbus-conf
             (lambda* (#:key outputs #:allow-other-keys)
               (let* ((out (assoc-ref outputs "out"))
                      (dir (string-append out "/etc/dbus-1/system.d")))
-- 
2.22.1

[Message part 3 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 37054-done <at> debbugs.gnu.org
Subject: Re: [bug#37054] [PATCH] gnu: wpa-supplicant: install documentation.
Date: Fri, 16 Aug 2019 22:47:12 +0200

Hi,

Timotej Lazar <timotej.lazar <at> araneo.si> skribis:

> * gnu/packages/admin.scm (wpa-supplicant):
> Install READMEs and the example config file.
> ---
> wpa_supplicant.conf(5) does not explain all configuration options but
> refers to the example config file, so install it along with READMEs.

I tweaked the indentation, added the above explanation as a comment, and
committed the result on your behalf.

Thank you,
Ludo’.

Previous Next

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