all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#63928] [PATCH] gnu: podman: Fix path to helper binaries.
@ 2023-06-06 14:41 Hartmut Goebel
  2023-07-01 16:08 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Hartmut Goebel @ 2023-06-06 14:41 UTC (permalink / raw)
  To: 63928

'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





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#63928] [PATCH] gnu: podman: Fix path to helper binaries.
  2023-06-06 14:41 [bug#63928] [PATCH] gnu: podman: Fix path to helper binaries Hartmut Goebel
@ 2023-07-01 16:08 ` Ludovic Courtès
  2023-07-02 18:48   ` bug#63928: " Hartmut Goebel
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2023-07-01 16:08 UTC (permalink / raw)
  To: Hartmut Goebel; +Cc: 63928

Hartmut Goebel <h.goebel@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!




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#63928: [PATCH] gnu: podman: Fix path to helper binaries.
  2023-07-01 16:08 ` Ludovic Courtès
@ 2023-07-02 18:48   ` Hartmut Goebel
  0 siblings, 0 replies; 3+ messages in thread
From: Hartmut Goebel @ 2023-07-02 18:48 UTC (permalink / raw)
  To: 63928-close; +Cc: Ludovic Courtès

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@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-07-02 18:49 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-06 14:41 [bug#63928] [PATCH] gnu: podman: Fix path to helper binaries Hartmut Goebel
2023-07-01 16:08 ` Ludovic Courtès
2023-07-02 18:48   ` bug#63928: " Hartmut Goebel

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.