--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#63928: [PATCH] gnu: podman: Fix path to helper binaries. |
Date: |
Sun, 2 Jul 2023 20:48:36 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 |
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 |
--- End Message ---