From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8Im7EIeleWIG0QAAbAwnHQ (envelope-from ) for ; Tue, 10 May 2022 01:36:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EEm+EIeleWL0kgAA9RJhRA (envelope-from ) for ; Tue, 10 May 2022 01:36:39 +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 0313917381 for ; Tue, 10 May 2022 01:36:39 +0200 (CEST) Received: from localhost ([::1]:46504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCve-0000tQ-8d for larch@yhetil.org; Mon, 09 May 2022 19:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv4-0000EG-PO for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv4-0001SY-Gt for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv4-0003yY-Ey for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 3/7] gnu: containerd: Update to 1.6.4. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934015202 (code B ref 52790); Mon, 09 May 2022 23:36:02 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCui-0003x1-Bw for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:40 -0400 Received: from mout.gmx.net ([212.227.17.20]:53943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vs-PR 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=1rB/jtLzY4rN2tVRaszVD08rEMWgs27Lr9Zyxe1TIBw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JjQiQPTWRcH2K1nROzP4Jw+kClWWIArYr8sX8A9YPT/RymTiHkhaSU3B9vHPTfdHa /WkC+j55YRxm4ULuVwCV8iRWq6dCCPJSnc+AKpf0yanlsDoNbZkTVFJoEGe5quWORe EKmZJOmFbdAI0kZg7WrX5WJh9dmxtAtsX/iAmjws= 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 1N2mBQ-1nvoBu2m0y-0133yx; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:15 +0100 Message-Id: <20220509233519.26703-3-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 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:93Rm4xIRpVH+xPlSF8Dl3629sFmPD+MnqRKvR06O02xgOrkcux2 Iq+x7/jnegA3nBHGMV3gon45B9sT9YjGNVFaV2DWY2ePtlLJU98EjuaOj5kIns1Ywlb4ehQ O05CAZCYB3n9ZpWvGOvvCjBPHffKgGSxQXEMMmJo7733PU4fqkXGaHg/RhvJMze95bHcPQn wMC1D2JBTbg8y31FK5Wow== X-UI-Out-Filterresults: notjunk:1;V03:K0:5Sk3gXp4WwE=:aeQKSqkZit/+wBOOEPr4VO Caf2y7hjMX9Pf06uUVrVkGG7PIXJcYvwVYRiSycKWi/4gUXyDnymEAhS7KZnwV3O+/7xGnbBE xRxDfaZDJkzZBhYwO8xK83SWcYwcfAntAvXXWEAsedE5WjjlZnRjTe+paJoJ2OymkHXUyJrTn KcbQA+DO7dZl2CIAcO8jrqBsW4rvbOTRaZtEU9+HZGohE/jjDVyALmFV8gk3fipveGdNZS932 2GEA6EKy3msXSgNtWdBVhjF5xKpdH9bVIM7L7LfUl/J3Hy4J3cPviaExpPb7x9GoQ6H5miOuG hpOWzzVwzvYayv3wigIv7N+Sb+MPna3tUP2TKFVa5gaCny5wXVJRLz/zrqW/DohgcfhMybKDT Qsy8f2mIfAJTrS9fES6CWv2Kl9GsoT9GC5elaFYHURCOOzm9EBmxz5a9hKxz4qCVMrbHePvpM 7VdK2VIkxs62feNKi1iNDozv5sumYH9LvadHc1rKiBbrlyn8LQBNmbcC0PSCRTZ2KWl3G51eg x1qqo4/ZoYrsPVgzqGM4z/i2zdpZpvy2b9uQbzLTXSWkZl0tRsVOrbXZFIKCEOG0woC6ZEgqK Fo6REGzCZatnO3wnDZVKBtXmAZtcixWug80yjJ9vdV5zTFjWShlsv7eyq1vH0au55r5qGEXWr YbKBQ8vWMbKP2e/cJJn4oWYJuWOuYY/QrTimgs4drG4iR6cJ8FcEJjaxC11huZimai9F2dTxY B2P4XmLrfyHh4LsIvLAMtR+bqEoE8+rJHsBKOXr+f4XuhN8AA4k81BXuxydtdYl/4BkN2kpcu YXBgJKtZVwqigMG1wq0fEsHKSBaGvuY1jYhJBHuFcgITpx8NwLh9hr+a/8zrS7+v01GQ88ek1 n6rroNdaPqtZmt0VWGvzK9F5olB8GKa23ueA4hjoBVyMw90nwut5CV+8QCxpKCR1EvrZm0xFK Sr+oFKUVXqWD4+887doWca6RL9sMDT2KGA6oDVNnOsoUt6rwLsiBDDMBC2IYUdaLmLXbhvJve 5MTNuUwqisweLx49rlPQ/A1IyFjOMSbhHyhJhr/X1vIHHnqwB8n6m/x1n5icMLsZhIAVKsoKa bMzicDUZSAwuMw= 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=1652139399; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=KhsVmHVD8+QlMFuewzikNMiwcEsfI+0VoGkIX8MzcNM=; b=nu2sL+5LhhTG4ctG8BvNWs1MxicIkraJhAk034qbebJdRr5fVRd6Nrwq1vEetTuxy+nyFg D547aGo82hUV0lkLob2X4EsiHIgnkaoEZqsAdu2vr8/YlyZO4M8eye12nXRpTOTo1CFq2j FvwIb4gTb662fU1/RkyYkWisr8xg+jSAd6YPZ6klumNa62atZG7xqmXJDTXTyc8LcWKS2k 3rrRSSIVRTxm69caBXP5G3vxZXA3+NHN/SKIN27qznenlHx7Uy6X2ajlqOjjMc5UHS7wgS Vq1FzeDQktfXfMhIbhcn3ffsV03k/P3tDzoheOfTucrKx55UV9ddCdqg9UUJuw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652139399; a=rsa-sha256; cv=none; b=fjioQhWfEtpBVtDYjmolls1J5J++6wYrXhhJTjFVyDdtrrc+uygyUKP+vaoaSRdUVurP+l iiWrXqr3f4ShH4eNpS92oNg+n+74xwGJl5chJk8+fj1lWfbo23ewEQCaFIrKtv+8oC/iQ9 DG5QBOG1H2cXC2rtNCfvlzbWmZbCKRtXb8fsKzQmX1o/TlOqhTTYV6BNdSJG2zVK+ni2df N7t0Rtg9De4J0NjtqbSSBTFa9aN545DT3FkRHJJHuYjUXGgxc3cZTPKfmoLIwX9jCfWJNG X4SVyTh9uxH84+ud35FLSMqD1MQXcTdDIFk3EBcotZ5xbFq4j7DfzE7eTE777w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=JjQiQPTW; 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: 5.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=JjQiQPTW; 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: 0313917381 X-Spam-Score: 5.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: WsyEN1wCXVm0 * gnu/packages/docker.scm (containerd): Update to 1.6.4. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". = Set PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX. =2D-- gnu/packages/docker.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 5c0f4d496d..e95614cfae 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -174,7 +174,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.6.4") (source (origin (method git-fetch) @@ -183,7 +183,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))= ) + (base32 "1hy5jaf5x8lffh3p4hdkk6ar8i4w84i0b539k1h5baqx9gnq2l2s")))= ) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=3D" version) @@ -203,6 +203,11 @@ (define-public containerd (string-append "defaultShim =3D \"" (assoc-ref outputs "out") "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (assoc-ref inputs "runc") + "/sbin/runc\""))) (substitute* "vendor/github.com/containerd/go-runc/runc.= go" (("DefaultCommand[ \t]*=3D.*") (string-append "DefaultCommand =3D \"" @@ -226,8 +231,8 @@ (define-public containerd (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-pat= h) (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=3D" out) = "install" - ',make-flags))))))))) + (apply invoke "make" (string-append "DESTDIR=3D" out) + "PREFIX=3D" "install" ',make-flags))))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs =2D- 2.36.0