From patchwork Mon May 9 23:35:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39188 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 C796127BBE9; Tue, 10 May 2022 00:36:29 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 8C4FB27BBE9 for ; Tue, 10 May 2022 00:36:29 +0100 (BST) Received: from localhost ([::1]:45726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvU-0000EZ-Mu for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv4-0000E0-1o for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv3-0001SK-PQ for guix-patches@gnu.org; Mon, 09 May 2022 19:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv3-0003yJ-NM for guix-patches@gnu.org; Mon, 09 May 2022 19:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 2/7] gnu: containerd: Fix patch-paths build phase. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36:01 +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.165213934015187 (code B ref 52790); Mon, 09 May 2022 23:36:01 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003wM-Oj for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:39 -0400 Received: from mout.gmx.net ([212.227.17.22]:57581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vq-Em for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=mpJqyN7EBdfr+4b+T7Y9x8pTyAHYJ1iFk1ALgFk6cRk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ia3pQwq6VgLYMqPS6ntuv4zqBI8fc7nVD2Mk9LuKCCiIV0LJ3LKpMwB0DrAGWujCK tfCZ+B71Uv7E32bJOmX6ICkPIe3KPUE6xYFiw8FrnD+MXhymOQr0wIFncZrclorloP eAbyK+GSzC42+mWyrNBIh3AIy54oulgHEQWfDbAY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N49lJ-1nwd0Z1UIL-0101iE; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:14 +0100 Message-Id: <20220509233519.26703-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:hpiarWYNPb3HvLR29ruwV/+IxENdcuwTOGc0GQfyVLFagpCdRlZ I+Oz/ifVa+Z8tbz1qjyLCI1piKlznLbRyKqeNHEgG9Ct2N2BId4HherII0WJSSvYI6DjOGi Il//onNt6Jty+HEMUzgBrrJLRh/+Oi6nEatDZTy9Xk83goqVlsV9OQd62Ey7nkn/djqr2mW YCM5f8RSR8WvA36ESdA/w== X-UI-Out-Filterresults: notjunk:1;V03:K0:+eSvTks0Nlk=:l12/zQzo6+Q176+wIIZziy OPStWSGNZlB3Yo9dMVnn5ixZ/nM94sc+lfJb1hRvleSVvoKq4F1a9C1f94KeR87s6ZciJir3t 75/gvd6bmwfwT+D9JBZmS1sHCmQPFOFhmPHjoqQ1D0QWlSpAgi/JcSCzsaT59312wlfuLSpae xaCBKeC5JHe3STkjfo5zk7XXinuSl02n+aQf4mSEHrd/frcteAekRKy+5nbRSNERzymyDgaO6 iGKSE8smUYa6JGTDnjRJNnP0z1mH+LYl0eZ3ZgUBsCm3wnjaVBX/JCAqfLT51VbwpsK9xsPKp d6sd6bwkuR0FaxTj6+81R6479LCx6hZkngsUDZKwsyTx6H7I7qqRavrLd/zcUHJUzlu05DMcm IEcMe+DnhnHccdOuwTRlgyIm9rbcCSVoGlvQjc1MO7IH38qPVCKXZOdIY8Bh6egtp9Y7fQbp5 HAuIlKseZR1DvViyZ/yWjdKmGM1tFZsO0bgJ79XhONr0h8huuaJkzgsNnT4nHpvgMFM7Gy7FU Bc/rYfNLAyUaG9elEOxP98DhOH7Tb/ykZgU8vMX8OuAOAY9QmCj64kUTKJnD84dbyv/FEZvzL nFV5Rs0Rrz2/r8t/rs3I1A+CZtG1tWaCF3vaukDPOWb9a+Rc5xsGe1q4hm4lfW5L0dXi2Yhsf mBLkQAlgKdv3F6R9cwBqA13C7f5UwKmF/41+TckpokHKZ5O7pLu+TutKMnW0GDcB7j+vW4uUV cAf7tiLvvoRlJ8exRO2ynLc5LRAV6/OmM5b3uIdtAkpYxxhGsNfqtGVIePE5KWaNx6FKc5D5T 7qAnk4xiP6lHSJF2YO/vgj3ZTnF6dFdJDgguQahupPflQiraEPjWKHNcwOnR3bUQAbD+qSQST w4BR6LFBJ+hI14VM3YBMj5i8ruNkJdoARx/3qszB8/9QsSfBz5IkD/iaOkT1Qhr8sMT22mWJ2 5CPMUsMU0aIM7VOA3u+OxT9+MhonzJgnsGROfRlRHc7GJl/phb+lJGMsDDrn+ivQv9AgIrGx9 ALfrEKOJo7WPdHJGXUlIUi6z50vloiopqT427+FuDwQ2IWUxH2EJpJ/vIG3qhIOMpTp1XgbqC ZkhzOfGG8oKn3A= 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. --- gnu/packages/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 07731886ae..5c0f4d496d 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2021 Oleg Pykhalov +;;; Copyright © 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,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"