From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kD/sND1MRmIR0AAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 02:50:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AI9IMj1MRmLLYQEA9RJhRA (envelope-from ) for ; Fri, 01 Apr 2022 02:50:05 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8841A2117C for ; Fri, 1 Apr 2022 02:50:05 +0200 (CEST) Received: from localhost ([::1]:57254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UJ-0006XX-GJ for larch@yhetil.org; Thu, 31 Mar 2022 20:50:03 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648774205; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=E7/x39DdS2f//06+EJ+T+no9kQlGIoaKs0qSCW0s4VY=; b=HVqpqdUC1DPOlNKXcRsTMEPo+uZ4J/Q005Dzu+n7nFE0aaHLMd0Rey/Wgl68W7NgN2aQpd 8/45LPja+Wtf6yE7Bq7hSIc2E5uPb2f63lAXRgxJTy0QjC4gS+OuhWBDzLN7sGvV0U6q5h b25K1FQ0DFpYN9nEBtWtFVhlPrX8giFRMYTxYz+6iz8ShKB41E6/NNCfRhelAD7civ//lz bLcJ82OryuuwTp/NUtXOlSaE8Lpyp4+uTwKo1S/a9HmD/ICFhy7GkdFDGG/smHVaJZ+Xv8 e0A2wsHB9qEEZuHe3/D2HkUvJhlNaf89ll0iuopoTU0ce4YSFIpARwdPQb6kqA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648774205; a=rsa-sha256; cv=none; b=jbGOUCkmWSZPRVu1K9fYWT55eKSCxakEnt+JNw+MmNO5jPOjszziIB5Si46EBQN4eqtzyO +oKcZEiLiC5zw8zoMDZOj/kU7FMk70KnIXyVwi23ubnABEEpLVhZ4STeKEMxowf9jtdkuZ UpQ7CWiedLsN0gvglJpz2oi4HvFu6nkpUI/h79zfdSnWHkaAhIBGGjvRzcyAKXN6itJ6Qe 1NCopA6tHasRfnUyHyTMN3taxQeCYN/nqym+lTECRjPfLOXL9DLwNGnxrINYwZkyKvCnx8 m/t0nYJbdc45pMiEVIRWakKkKY3bdxbGKS3/z6sg5koeJvSQyqInN7xWKQngHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=hmyvNz33; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=hmyvNz33; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8841A2117C X-Spam-Score: 6.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: +oKpUaa+oS0B * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. =2D-- gnu/packages/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3f52f4f8db..b76db22d58 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Katherine Cox-Buday ;;; Copyright =C2=A9 2020 Jesse Dowell ;;; Copyright =C2=A9 2021 Oleg Pykhalov +;;; Copyright =C2=A9 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-key= s) (with-directory-excursion (string-append "src/" import-pat= h) (substitute* "runtime/v1/linux/runtime.go" =2D- 2.34.0