From patchwork Tue Jun 6 14:41:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 50737 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 119DC27BBE9; Tue, 6 Jun 2023 15:43:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A5A5C27BBE2 for ; Tue, 6 Jun 2023 15:43:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6Xto-0004vw-7Q; Tue, 06 Jun 2023 10:43:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xtn-0004vn-5S for guix-patches@gnu.org; Tue, 06 Jun 2023 10:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6Xtm-0003bq-TG for guix-patches@gnu.org; Tue, 06 Jun 2023 10:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6Xtm-0003Gw-Og for guix-patches@gnu.org; Tue, 06 Jun 2023 10:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63928] [PATCH] gnu: podman: Fix path to helper binaries. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jun 2023 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63928@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168606252312506 (code B ref -1); Tue, 06 Jun 2023 14:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2023 14:42:03 +0000 Received: from localhost ([127.0.0.1]:52779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Xsp-0003Fe-6x for submit@debbugs.gnu.org; Tue, 06 Jun 2023 10:42:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:56840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Xsn-0003F8-U1 for submit@debbugs.gnu.org; Tue, 06 Jun 2023 10:42:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xsn-0004nc-Na for guix-patches@gnu.org; Tue, 06 Jun 2023 10:42:01 -0400 Received: from mout.kundenserver.de ([212.227.126.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Xsm-0003Pj-1l for guix-patches@gnu.org; Tue, 06 Jun 2023 10:42:01 -0400 Received: from hermia.goebel-consult.de ([87.176.157.31]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MofLl-1qQGUx10Rt-00p2PP for ; Tue, 06 Jun 2023 16:41:58 +0200 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id D1BE15F5F5; Tue, 6 Jun 2023 16:42:05 +0200 (CEST) From: Hartmut Goebel Date: Tue, 6 Jun 2023 16:41:56 +0200 Message-Id: <605ec1ab24117c2db1625bf1dafc7736e6080a51.1686062510.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.9 MIME-Version: 1.0 X-Provags-ID: V03:K1:23SCOl+LY18z3ynt5J8hqIodGJ32Qc5i9HeUJjtiEEj4qK98ciL Dme7v0xHAI7WiQ3/pAkJ+ZUQ4+LZyrXcY3lP9oyhMOEhfRzSg/32KgS1e/rRDZCbZMXpoo2 46l5hDefxsMljVCiUX8IW5/LdNR2nLZTgJUnJRJ70tJQUyBznrAfjSWsZzmXoePqumwfUiW kbP7jzri6EN+cnYxg4SVQ== UI-OutboundReport: notjunk:1;M01:P0:kJqvYHX4htE=;pXcN8fG3W47yO4QPOL7ViOWt3lR 0+XWlZa1D2LCIqmA/cifvCoAzscXeYlCt1MykMgrFnawn7N97SFaMG5PgSeAaZi9MsXz9TWId trq5/zzcWuHT+/FvFqbmZN90YHctiCHC2N6xBRXlb2MBtpTZQRw3akrIsJaVljMBFJFa8reda 1NNjvebebN940LVGfpdgpMEAfD1sP5Sx1pJp6ynmYAG4Mljcig4W8sn5m981m55iaW47yAynh GZlubUIxZTNz+B35eBVKSvFGOFq254d4EAZZ7P7gLJxJWZQ8pb/kVf9v7yRhjkj6wa49Wf8G7 i5+m0tAi7CSd7DtrsLs/WGx+eKLe2w9EODV9NkjD3fXy6pHbOS5VUyj7fGd4agBiu1fcUve04 Fah3dNhreWC5OGjwAkGYdKnd0iqjosy2K++z4gzs4RW1EyNX06nfQHa6UUXcGfQUUJBq7wiyH L9Bn7+1RogCdSs/QHw+EZU1vsrMgaAWP95pLrODIzwJnJhp64D6V0SbzAcygMJustCeUS2iZ9 RKlRSLsVNQO9TNE/GxsISjerE7Q+wxZcp++2iRs9W9pY8/7bDPqNMYHrIZ4M7/HiTlARNrjGk G3Eo1fKm4JThIj+xQRSBvtqFvREkmo2wneEYOOP9vSPXsCWDOSCzXmDxVntQs7IHEpklINzjP B3AcU+uvoE07AlJIy4ratgRHU8q5bngkJOiFRpaINg== Received-SPF: pass client-ip=212.227.126.131; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches '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]: Change subsitution for "/usr/local/libexec/podman", add substitution for "/usr/local/lib/podman". --- gnu/packages/containers.scm | 2 ++ 1 file changed, 2 insertions(+) base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67 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"))