From patchwork Sat Dec 25 14:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 35649 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 79B5927BBEB; Sat, 25 Dec 2021 14:41:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham 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 447CE27BBEA for ; Sat, 25 Dec 2021 14:41:12 +0000 (GMT) Received: from localhost ([::1]:52344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n18ER-0004Sp-El for patchwork@mira.cbaines.net; Sat, 25 Dec 2021 09:41:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n18EI-0004Qx-U2 for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n18EI-00080p-KQ for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n18EI-0002bn-J4 for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH 1/4] gnu: containerd: Fix patch-paths build phase. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Dec 2021 14:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.16404432259910 (code B ref 52790); Sat, 25 Dec 2021 14:41:02 +0000 Received: (at 52790) by debbugs.gnu.org; 25 Dec 2021 14:40:25 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dg-0002Zl-W3 for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:25 -0500 Received: from mout.gmx.net ([212.227.17.20]:33289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Df-0002ZM-Id for 52790@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640443217; bh=Zf60O/h4LX1v84FiatftpJsjqrFkEvkxmMbcIugkdBA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ZlxlVQquauSDX8N8lf1TfOx0XWg0ckSdtKTtYY0OFAs5ltWYeLi/4C6TJGTCD9u2n gcROQZdnUOP7+OdrllE1RfECxe2k9DE2l4PQG00p47PTbcISj0A3oKYQshxPOqqGNA eLkGNl1JQuSp2C9SONSCmzmGxNqJsuA9gyTqfJ4Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsYqp-1mBuPa0Eln-00tyKg; Sat, 25 Dec 2021 15:40:17 +0100 From: Pierre Langlois Date: Sat, 25 Dec 2021 14:40:11 +0000 Message-Id: <20211225144014.3196-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <877dbsu57g.fsf@gmx.com> References: <877dbsu57g.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:XLcXUKriuz2mfUI4iiSIaI3KC2LyefBbOxNXpyMIMFXmOMjwDyO KuVpyrYVERvTENzrASOOmuWPlqey5TnZczgT1rakUP+98+FapHzcr+gzNSWNhrTXPkfMtRF juqbJUZuxW0UueVCxTJCFz5NsquFOguVdvCVgKXfdCy8+xoibL0oog3iTkYV78MbW7WFk7H vBaQ3puIo9T8ZnCQrghFg== X-UI-Out-Filterresults: notjunk:1;V03:K0:iNclDBaTYsw=:TQlTDzCGqq4CbZFE4XrJYJ uMNk5Xiybxogz1uiChqOD89lkiBB93Uesm25p35Mj+HsmDgFa23IpVueq6FbhxxDRGpPl+LmP k/H311WepoBGURGcnFbI1e0H5PSXgBIHpaVgCabBj59CN+Ll48u7ktKd7tlzlLNFczAlUhJsi RAWMfIfL0DRXFO+WIZYKt6/K6rboE1CKCXgQsx1ICX/sKNFvz2mAxQu9df4Ezyz7Y1YPVDKWq tdBFN2uCcEIV1YlHsE/Bw0RJPzzgPtjgWWNo9Rdf1653vD/a1oPVbrbZ/J331BqxOm9JkdIhF qfyA5x/YQRcIQgalvMZ96VSkeuNNqHq9YZ6McVaBmzA4qX52pz09mTEqSQx15qCpQrEk3zypz Zzq2F+fl9QW35xuxokf8cHMNdLGaTFd+/4i2KKNZob65Ll0FltLBqsVD68ULMss9f4ndJZ8xL qfXCvjUeihsBMkQLAw2tdceIG9ylYByZZ0+wYs0iqnLauFE+LCtLkbV27FPkU5l6Hr6d/MUiI ogpCLIAL2ogSjJzTZvRe4hdWumULAdh3wx6madrYbHxr0K7lT3jntwJuhafvxnPWCQ3fHlD8t KTCWJZ+EcCV5qhCTuBpIEXmydM3VV3KOX74TbZ8vngrOJihwhEwSIS4DcFfWwmbglR/aQY2Ed PateNN8h/OeLcNkYuo0oiKAUJT9qiZSMCzIr8ydW2cMP5R3ioGU28USHbUM1BqMys8g5zqdOp A6euBl3YslHWTOkztTOzAaveiHRp2bsrTTFptCSjcehvKC3EjIxJ6SXCyVtE8nYxTNuhMgUME 7zNOEHeIpor8k3HccaCglSGAAu/faTTdM8bx/A9vb9tphramGRyAbD7GlxYs2piidATqs1tex hYK3g8S3xknIA0GQPe3sLCU6tozy8iMqwlS70xXLQZwhnbx4AcK0GiqWc1HWgR9g/2qoo3I+Y Ii0Taq5Tlm1DEI0xJxig1DlelVVY2+NEptnEMZols5MwTMQbPnUpHsJ8Z6hKeGYyC0CbBBlhP PkSFIXQlKTxWk30vVpilaTMHGHOTNqigLagA3bTTXipPhrzDc+3HKOgW+YJxCpjDAby8krwDW BKlbLDSF+6OlTc= 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. Substitute runc binary for "pkg/cri/config/config_unix.go". --- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index d012ed43c6..47e4fcd2dc 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -190,7 +190,7 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-after 'chdir 'patch-paths + (add-after 'unpack 'patch-paths (lambda* (#:key inputs import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (substitute* "runtime/v1/linux/runtime.go"