bug#40581: [wip-hurd-vm] uptime from coreutils looks for /bin/w

bug#40581: [wip-hurd-vm] uptime from coreutils looks for /bin/w

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

I fired up the hurd VM and ran 'uptime' and it complained that it
couldn't find /bin/w. 'w' was in the path.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#40581: [wip-hurd-vm] uptime from coreutils looks for /bin/w

[Rene via Bug reports for GNU Guix]

[-- Attachment #1: Type: text/plain, Size: 118 bytes --]

Hello,


Debian project currently uses `/bin/w` from the hurd package, so I propose the attached patch.


Rene

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-hurd-Fix-references-to-bin-w.patch --]
[-- Type: text/x-patch; name="0001-gnu-hurd-Fix-references-to-bin-w.patch", Size: 1312 bytes --]

From 456f05894e08961b1f20fe2ff8a6731abe9d96f0 Mon Sep 17 00:00:00 2001
From: Rene Saavedra <pacoon@protonmail.com>
Date: Sun, 12 Apr 2020 22:33:08 -0500
Subject: [PATCH] gnu: hurd: Fix references to /bin/w.

* gnu/packages/hurd.scm (hurd): Use '/bin/w' from hurd package.
---
 gnu/packages/hurd.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 88af75c48e..fcbbaad10c 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -398,6 +399,9 @@ boot, since this cannot be done from GNU/Linux."
                (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
                  (("/libexec/")
                   (string-append out "/libexec/")))
+               (substitute* '("utils/uptime.sh")
+                 (("/bin/w")
+                  (string-append out "/bin/w")))
                (substitute* "daemons/console-run.c"
                  (("/hurd/")
                   (string-append out "/hurd/")))
-- 
2.21.0

bug#40581: [wip-hurd-vm] uptime from coreutils looks for /bin/w

[Jan Nieuwenhuizen]

Rene writes:

Hello Rene, Efraim,

> Debian project currently uses `/bin/w` from the hurd package, so I
> propose the attached patch.

LGTM!

> @@ -398,6 +399,9 @@ boot, since this cannot be done from GNU/Linux."
>                 (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
>                   (("/libexec/")
>                    (string-append out "/libexec/")))
> +               (substitute* '("utils/uptime.sh")
> +                 (("/bin/w")
> +                  (string-append out "/bin/w")))
>                 (substitute* "daemons/console-run.c"
>                   (("/hurd/")
>                    (string-append out "/hurd/")))

Looking at this again it looks fine; following the pattern we created.
This now makes me wonder whether upstream Hurd could use a patch for
${bindir} and ${libexecdir}.  Possibly even for `/hurd'.

What do you all think?

Greetings,
janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

bug#40581: [wip-hurd-vm] uptime from coreutils looks for /bin/w

[Ludovic Courtès]

Hey ho!

Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> Rene writes:
>
> Hello Rene, Efraim,
>
>> Debian project currently uses `/bin/w` from the hurd package, so I
>> propose the attached patch.
>
> LGTM!
>
>> @@ -398,6 +399,9 @@ boot, since this cannot be done from GNU/Linux."
>>                 (substitute* '("startup/startup.c" "init/init.c" "config/ttys")
>>                   (("/libexec/")
>>                    (string-append out "/libexec/")))
>> +               (substitute* '("utils/uptime.sh")
>> +                 (("/bin/w")
>> +                  (string-append out "/bin/w")))
>>                 (substitute* "daemons/console-run.c"
>>                   (("/hurd/")
>>                    (string-append out "/hurd/")))
>
> Looking at this again it looks fine; following the pattern we created.

Yup, LGTM!

> This now makes me wonder whether upstream Hurd could use a patch for
> ${bindir} and ${libexecdir}.  Possibly even for `/hurd'.
>
> What do you all think?

Yes, I think this prefix issue should be fixed upstream.

Ludo’.