From patchwork Fri Apr 1 00:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38257 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 724F527BBEA; Fri, 1 Apr 2022 01:50:03 +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 14FD327BBE9 for ; Fri, 1 Apr 2022 01:50:03 +0100 (BST) Received: from localhost ([::1]:57254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UH-0006XX-KE for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006St-RG for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TL-0004PY-7h for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TL-0003ON-6T for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 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: Fri, 01 Apr 2022 00:49:03 +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.164877409412933 (code B ref 52790); Fri, 01 Apr 2022 00:49:03 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:14 +0000 Received: from localhost ([127.0.0.1]:40297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MW-AP for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:34063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Kc-L3 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=MvcC6U6hN7fxQUIhROriuHBQpgsuvj2vFKRUdFYkRFc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hmyvNz33WuwbV9v0fQFLPFM3mVKkBTU5OrNoDwAO53zz/pIiX+wz1FrTXh7VW7Gwz 6NboqUd2Z5h5AdJ0htHVABrgVrYYjID5MCSdt7ldjxvFheZejjyVIk1+uFlFpjF/Ju bAsIZ+JX1ohAinOt6BrmB2u7Ywf5j3Ujpsnq/7pM= 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 1MY6Cb-1nX2WI3BE5-00YSsc; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:37 +0100 Message-Id: <20220401004642.14949-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:k4yOIkug6PAhy/RISuMtrWxLKw1fdnoZa+u86vA2QUlRQSE49Ox ZdUafBqzgHk1UVmMIX1ItdUfoaALEyAaibesHtPSrD57XlozUcnSHIXLXgiTBIbow1YI/am CgP20iBBHpuxIP6Uvz+mABdMtqv0JRwSBgov2WsDImIPLgc3EkhU4GN2yBW2htDldkrs2DI dDzC6W/5mko3i4tdteroA== X-UI-Out-Filterresults: notjunk:1;V03:K0:y+BoSEDzkXA=:J1PBeKd7F9BEigse44KNsg fMhEK5ts3r9naxKETQJJ/nL7yLizdXI+Qegkh1kAcaRwLcyhnYflcXHhbXZ34U2U2ssOy5B2Q gHzDwwPbgmM5QZ7yMeE7k+DOf2gGJwIoB7RVFEyoD00BxrEGoHNgVt3PDf9aDr8S+lPSNxm8h 56oYT6++XPjUCRAy0USa7XwyL9vArH6y29SfxkArNbKjmvXbJmIIzl50meHU0Bs5dFmmSA3Ox z+tlgh0cUrqW0cT02KVluVSb3Bwbh1iKRtIqEdqG9DS0YySWA9WrDhQ1r47pyJdGg/I0TW8pp kY4/iOJQCaXLkKXBad5XJAoZtSmJCvMuIkYjFaqEf4CnrQhJOYORp3TmODw5b90BgLcZMtAbw sPqnY3db816LEfZB9oPw5riyHEFKZfsQq8GYw6d6qXQL0MRNQfwkPCXCGHljQsY0NsWwzfHaX LVNk1kIz1Spyk2P+ujk/F88CcJqmEDN18/nLYgCSDTAaykLpLL/dJ9UxMoI2FNqwgm7cn6x+C fYrQszV1dIiN2+g0aPGDWaGTOlRRV/nq+I165KRkL3Ws/h+nfAinXifYIsJRAphFnloiccfkd b0sU6prX0xDbMY6IvBj4IdTotAZyeyuGK99JDZrC0vW74sOYKUP1NQCn8IyBViiYyHkx0ICkP sdNIXAHZSjV0nJMSEC1B1zmY4VqtlCZ9fLwMY/RKDLlqEYv1SiYMntxDAXEyYek84RNOeAo8S Dn9bMyRRRjcXWt/THArdn6c8qe2EW6fMtVnb6LTLGRFrKcVUQNflHehovbIPJzoeGo3NXQHlD GYyoINiblh+hP2Wc1ek/LnmYNNTGPetjGbX10HcpJ+2wsC0YFtj5FjTFBcJioBXvuCS5egppi ndKW9aNBnR1HC1VAi2VJ8Bkb0EVmMnTL8TXi2nGZyrer1BldyCuiAM5redxu9EzK3KBanlOpK adu6UUiLEiTLmu/4zUXnNl3Y/VCNC22SCp8fMbGxT1vhQkXz24Ib0IHAwrOgdGxaqVC60VLJ/ /jqOWIlN8zUn4u0s0H+EjrBP+0foH/gVB4W9aeQAJBB2cWcixjOyiZCSeG4L3IiaDFetDI6E3 oOTA2lbUqZ3F/I= 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.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3f52f4f8db..b76db22d58 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"