From patchwork Fri Apr 1 00:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38256 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 36C2127BBEB; 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 8C38327BBEA for ; Fri, 1 Apr 2022 01:50:02 +0100 (BST) Received: from localhost ([::1]:57214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UD-0006WC-Tt for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:49:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006Sv-RZ for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TL-0004Pa-LV 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-0003OU-Ja for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 3/7] gnu: containerd: Update to 1.6.2. 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.164877409512941 (code B ref 52790); Fri, 01 Apr 2022 00:49:03 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MY-O0 for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:56489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Ke-34 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=+IvPEElv+cBXbh5a0A65j6GOK6ILdAzJ6HR/YfD+DKI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XnzO2wCPf+WPRge9jEplPe8JZNY253p2JSZWaGICtdN2+KOh2keYHk7lB5gxlvTtg +hlRKFTSQkdVq4hJfneMrpEwFMIQ6ttX3poEp4cjJQhQMpvi0NyCeidkOeYDFZ+Obb Q91+eXF0Mn0BEaHg9W81Xwistat+a7gGj1G0hhw4= 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 1MXXyJ-1nWUHv0LTb-00Z0qO; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:38 +0100 Message-Id: <20220401004642.14949-4-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:abrjmIZq+iztjVYRWSQY/B8YSavoSfsuDHSu10PSUlvHj5PToIw Gq9wNpgitZPe2tdAE93YtvoOtE5txsfdwAUHyTXWDy+kpyY8dNhqBtwZ/RZlabQGMTOK+2w f++gkdLw315MSzF2Yql1P6MXjvr8U3UO0y2Z5QpnwG4NTZQAU+4vGD8o5B+xyLnQrUCLeaG oSlWoJeKzBRrjOo9beGSw== X-UI-Out-Filterresults: notjunk:1;V03:K0:zsp6pgBsbjA=:I+0UmHrzc0N+mXrQvcm9hw jf04X64/h2FBMOY+Gy56AiA4tASYIcc/pLctg0T8eyfphqjK0Hbsy6cJ/vY2BzZlRIZ9si0I6 IVA7g0XmotNnu5UtIGCngxJptdvs0eOzg9wtEWP28EG0PHfX+s1cmShn7ADhJ415YN9tDEAko jbgzC+Qknyl3wYkJ61JjEVodFpIVE4uRd7LFqlaDGoHDfxThTIzcih4gKf0aHUpIpYYd1EkUl eUPiGCcNTQjVfhhzAi7Qk9LmtRRqPf8OxCuVm0VySG5xyvAfqUjvgK9Y0Gz7hZw2WhHYNdBRH 9caBO9rEfPVLpw1vUIgFYiHx48vGMvZrXeT1bF4uT9fb0h+VWyzKH3lq/nyIllr532o6/yVF6 o7D4glynrGhxWu79lBz2DQiG4kmLVjg/LqVHz5TIBTOhPLGXQCxRxcWTk1UmgKIYW/QVI/+hx 1VW/MPue02kqWq9S29+qNBMFnb9EGnkKY7iFw3WNFF6q6nhDycPmCBs8EAYUW2NRiXPYwWtFz uKOxDTAovwUJkSnAgm/GzQCUhDWfUgt+sQPwrP2MSkLnooI+pHZs1sHSro8QRYgnEeXUPLYB+ lX+Q1PieT55UrtAcB6NRJpNJcJEvQOOxQ3pGdtmafrV2DveAPh0jkwDkafUAzlg45nTaELdkj eXRifPTwMWEhu1qEChDhILcD9Ph0TRZHjKrkQVOVnIEpLQ9UrV2GSSa7AeDKcAeLjT5LBsfSS 0cOAgnzQqat2E315D6jS2zHTIq1fEhDF9+3F1pp+rfNBgIIzQ7S9U5PBd6u0KrF8IbKZew9Z2 YdJs2XEZD/NZR8VKCBpU2rbuyiwhEQthMmOFUIGbnFRxPIsSRBT+oYKgeR4ek7bRKmuKydALO zgP74uXtdmsNSg9ixP4IHdP4aGGkYHMuZndk1XPJlK8yLFggw/LXBNIZdomEJ5PKaj/RK71z/ hI/4D2sY2D4q6QuUoFZ9x+sQYwEI9X6ZzqPFkHqNIlk/dIOYAtG2rYQOXRCUsiBuSp/5EcSSM VOBJiWwkKjvM46JLaCEGwBIPKFOHNQVzvbcP/LEURoBpRcZNuKsyY36d4S0JMi9Wat/aGYWLc RMSwaUQzQ5DDzk= 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): Update to 1.6.2. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". Set PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX. --- gnu/packages/docker.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b76db22d58..7a7594f2b1 100644 --- 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.2") (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 "0fw62aya0gwxaa2kkcjkbifp8n0xmk1x0qzjahlsls6g0pmh5pkq")))) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=" version) @@ -203,6 +203,11 @@ (define-public containerd (string-append "defaultShim = \"" (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]*=.*") (string-append "DefaultCommand = \"" @@ -226,8 +231,8 @@ (define-public containerd (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) "install" - ',make-flags))))))))) + (apply invoke "make" (string-append "DESTDIR=" out) + "PREFIX=" "install" ',make-flags))))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs