GNU bug report logs - #63928
[PATCH] gnu: podman: Fix path to helper binaries.

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 63928 in the body.
You can then email your comments to 63928 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: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: podman: Fix path to helper binaries.
Date: Tue,  6 Jun 2023 16:41:56 +0200

'quadlet' and 'rootlessport' coming with podman reside in
"#$output/libexex/podman", not in "#$output/bin".  Thus search this
first.

* gnu/packages/containers.scm (podman)[phases]<fix-hardcoded-paths>:
  Change subsitution for "/usr/local/libexec/podman", add substitution
  for "/usr/local/lib/podman".
---
 gnu/packages/containers.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index b402bbde6a..0cf89db23f 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -359,6 +359,8 @@ configure network interfaces in Linux containers.")
                  (string-append "CATATONIT_PATH=" (which "true"))))
               (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
                 (("/usr/local/libexec/podman")
+                 (string-append #$output "/libexec/podman"))
+                (("/usr/local/lib/podman")
                  (string-append #$output "/bin")))
               (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
                 (("/usr/libexec/podman/conmon") (which "conmon"))

base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67
-- 
2.30.9

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Cc: 63928 <at> debbugs.gnu.org
Subject: Re: bug#63928: [PATCH] gnu: podman: Fix path to helper binaries.
Date: Sat, 01 Jul 2023 18:08:15 +0200

Hartmut Goebel <h.goebel <at> crazy-compilers.com> skribis:

> 'quadlet' and 'rootlessport' coming with podman reside in
> "#$output/libexex/podman", not in "#$output/bin".  Thus search this
> first.
>
> * gnu/packages/containers.scm (podman)[phases]<fix-hardcoded-paths>:
>   Change subsitution for "/usr/local/libexec/podman", add substitution
>   for "/usr/local/lib/podman".

LGTM!

Message #13 received at 63928-close <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 63928-close <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: Re: bug#63928: [PATCH] gnu: podman: Fix path to helper binaries.
Date: Sun, 2 Jul 2023 20:48:36 +0200

Am 01.07.23 um 18:08 schrieb Ludovic Courtès:
> LGTM!

Thanks for the review. Pushed as 1d471bbe440ba254c6e1c557d0fad91d67e1450c

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Previous Next

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