From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 20:13:16 2019 Received: (at submit) by debbugs.gnu.org; 15 Apr 2019 00:13:16 +0000 Received: from localhost ([127.0.0.1]:33386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpFK-0005bF-SG for submit@debbugs.gnu.org; Sun, 14 Apr 2019 20:13:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpFI-0005at-ND for submit@debbugs.gnu.org; Sun, 14 Apr 2019 20:13:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:37753) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hFpFD-00018Y-GT for submit@debbugs.gnu.org; Sun, 14 Apr 2019 20:13:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFpFA-0003Hq-8G for guix-patches@gnu.org; Sun, 14 Apr 2019 20:13:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hFpF7-000170-9d for guix-patches@gnu.org; Sun, 14 Apr 2019 20:13:04 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:37106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hFpF5-00016E-Tk for guix-patches@gnu.org; Sun, 14 Apr 2019 20:13:01 -0400 Received: by mail-qt1-x82d.google.com with SMTP id z16so17285655qtn.4 for ; Sun, 14 Apr 2019 17:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=ghdmgBhxVUHTK+kfoe2vRLzHRZ5nUqkbrIrg+6Rlbis=; b=iHjQJGW7yRlAk0nEQiEo9tcNcOjiwrn0VL0nBdAqBcL9YMOGjPFTDN3DtTUzs5km2h oMfN25lm7+7lK+PlvJ6lfSZdLmJSRajke595XaOImkDHf0GHV+aQmNTkjZfw4LAUhtiz GowS2qiHHbbKTu2GcZAaMfZAmci5QdTBScCcrRdoTTQjanytQXS8uNvCSwWdMKZkEzfZ JQmfyhMwZkVp0T1WQCS5V/OAJDxgpNFj6gG3WMV8IB2DznXTI3d+7BiyDNvxgABS02RA eyKCySNeCri5v6k2igC5wTj9NhyALHbMvlowRyPuilrBFN9zHDRz1I74cOKVPLyBh/F7 Jatg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=ghdmgBhxVUHTK+kfoe2vRLzHRZ5nUqkbrIrg+6Rlbis=; b=ib5xmnXwBuZtnYeCm2+vXZP/Fgypse6UULtzDjvlO53Nm87stSACGMAVgmmFMqMjmt tAG4G/zqL7FbR57jn4YKB3r6kWneEP/QNuc1ebkO6kDvN2HHZQX1eOBlYeWPTiAYphqi 2NRY7efFh3CJhEZHFU/bL0fBqTpYAOn04YPs6V+Zcf0CfK7BNnXvurcRYM4KKd3ksebq AMORzOJDwpAN75+o3fQeo8FYyq0EfMAQEuUT3CzMNsaOj8KT1tmU34GwHaUZ6Bd+ENWD DZ6nk0ndYq0LZxje9X6JsDqbLT/Qho6mkNwubL3lqbHj+noJYSWb6nL5l+RU89qQHonu oweg== X-Gm-Message-State: APjAAAWghxpMY3xBIUnAOJVi0CmSGZSSm0blc1zv5PD2Whh3HWVOemXd itH5b1iyv8pqcOBwZ3ugQ9rHnvyz X-Google-Smtp-Source: APXvYqx1ZCSqFLUDR3QZm2+Ik39L/v+KahVlVFbZOrRyxojzM4UVFxbEewdOtEAYTB0/1YzuugC6yQ== X-Received: by 2002:ac8:17f1:: with SMTP id r46mr58247289qtk.141.1555287178852; Sun, 14 Apr 2019 17:12:58 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id u15sm34086857qth.54.2019.04.14.17.12.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 17:12:57 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: [PATCH] gnu: docker: Patch paths of xz and docker-proxy. Date: Sun, 14 Apr 2019 20:12:56 -0400 Message-ID: <87h8b0nn1z.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::82d X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain This patch series make a couple cosmetic/performance changes to the docker package, and then goes on to patch the references to the docker-proxy binary and the xz compression tool. Prior to this patch, importing a docker image compressed using xz such as in: --8<---------------cut here---------------start------------->8--- docker load < some-docker-image.tar.xz --8<---------------cut here---------------end--------------->8--- Would fail unless xz was found in the system's profile. Thanks, Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-docker-Fix-indentation.patch >From 1405716eff1c15bf2a44704f4a32e6e823f73bf2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 21:55:48 -0400 Subject: [PATCH 1/7] gnu: docker: Fix indentation. * gnu/packages/docker.scm (docker): Fix indentation using Emacs. --- gnu/packages/docker.scm | 184 ++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 1067555296..7445856347 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -299,17 +299,17 @@ built-in registry server of Docker.") (version %docker-version) (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/docker/engine.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) - (patches - (search-patches "docker-engine-test-noinstall.patch" - "docker-fix-tests.patch" - "docker-use-fewer-modprobes.patch")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/engine.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) + (patches + (search-patches "docker-engine-test-noinstall.patch" + "docker-fix-tests.patch" + "docker-use-fewer-modprobes.patch")))) (build-system gnu-build-system) (arguments `(#:modules @@ -326,77 +326,77 @@ built-in registry server of Docker.") (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "builder/builder-next/executor_unix.go" - (("CommandCandidates:.*runc.*") - (string-append "CommandCandidates: []string{\"" - (assoc-ref inputs "runc") - "/sbin/runc\"},\n"))) + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (assoc-ref inputs "runc") + "/sbin/runc\"},\n"))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand = .*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) + (("DefaultCommand = .*") + (string-append "DefaultCommand = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n"))) + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref inputs "containerd") + "/bin/containerd-shim\"\n"))) (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary = .*") - (string-append "DefaultShimBinary = \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n")) - (("DefaultRuntimeBinary = .*") - (string-append "DefaultRuntimeBinary = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName = .*") - (string-append "DefaultRuntimeName = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) + (("DefaultShimBinary = .*") + (string-append "DefaultShimBinary = \"" + (assoc-ref inputs "containerd") + "/bin/containerd-shim\"\n")) + (("DefaultRuntimeBinary = .*") + (string-append "DefaultRuntimeBinary = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("DefaultRuntimeName = .*") + (string-append "DefaultRuntimeName = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" - (("StockRuntimeName = .*") - (string-append "StockRuntimeName = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) + (("StockRuntimeName = .*") + (string-append "StockRuntimeName = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" - (("var defaultCommandCandidates = .*") - (string-append "var defaultCommandCandidates = []string{\"" - (assoc-ref inputs "runc") "/sbin/runc\"}"))) + (("var defaultCommandCandidates = .*") + (string-append "var defaultCommandCandidates = []string{\"" + (assoc-ref inputs "runc") "/sbin/runc\"}"))) (let ((source-files (filter (lambda (name) - (not (string-contains name "test"))) - (find-files "." "\\.go$")))) + (not (string-contains name "test"))) + (find-files "." "\\.go$")))) (let-syntax ((substitute-LookPath (lambda (x) (syntax-case x () ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.LookPath\\(\"" - (syntax->datum - #'source-text) - "\")")) - (string-append "\"" - (assoc-ref inputs package) - relative-path - "\", error(nil)"))))))) + ((#,(string-append "exec\\.LookPath\\(\"" + (syntax->datum + #'source-text) + "\")")) + (string-append "\"" + (assoc-ref inputs package) + relative-path + "\", error(nil)"))))))) (substitute-Command (lambda (x) (syntax-case x () ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.Command\\(\"" - (syntax->datum - #'source-text) - "\"")) ; ) - (string-append "exec.Command(\"" - (assoc-ref inputs package) - relative-path - "\"")))))))) ; ) + ((#,(string-append "exec\\.Command\\(\"" + (syntax->datum + #'source-text) + "\"")) ; ) + (string-append "exec.Command(\"" + (assoc-ref inputs package) + relative-path + "\"")))))))) ; ) (substitute-LookPath "ps" "procps" "/bin/ps") (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs") (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan") @@ -418,13 +418,13 @@ built-in registry server of Docker.") (substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2fs") (substitute-Command "blkid" "util-linux" "/sbin/blkid") (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs") -; docker-mountfrom ?? -; docker -; docker-untar ?? -; docker-applyLayer ?? -; /usr/bin/uname -; grep -; apparmor_parser + ;; docker-mountfrom ?? + ;; docker + ;; docker-untar ?? + ;; docker-applyLayer ?? + ;; /usr/bin/uname + ;; grep + ;; apparmor_parser (substitute-Command "ps" "procps" "/bin/ps") (substitute-Command "losetup" "util-linux" "/sbin/losetup") (substitute-Command "uname" "coreutils" "/bin/uname") @@ -434,24 +434,24 @@ built-in registry server of Docker.") ;; invokes other programs we don't know about and thus don't ;; substitute. (substitute* source-files - ;; Search for Java in PATH. - (("\\ .pc) + `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) ("go" ,go) ("pkg-config" ,pkg-config))) (synopsis "Docker container component library, and daemon") -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-docker-Cleanup-extraneous-comments.patch >From 64b8226b954c18aa9fd246c26b8c5958fa5d2e86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:08:52 -0400 Subject: [PATCH 2/7] gnu: docker: Cleanup extraneous comments. * gnu/packages/docker.scm (docker): Remove "parenthesis-balancing" comments. --- gnu/packages/docker.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7445856347..10aa3aa5b4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -392,11 +392,11 @@ built-in registry server of Docker.") ((#,(string-append "exec\\.Command\\(\"" (syntax->datum #'source-text) - "\"")) ; ) + "\"")) (string-append "exec.Command(\"" (assoc-ref inputs package) relative-path - "\"")))))))) ; ) + "\"")))))))) (substitute-LookPath "ps" "procps" "/bin/ps") (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs") (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan") @@ -435,22 +435,22 @@ built-in registry server of Docker.") ;; substitute. (substitute* source-files ;; Search for Java in PATH. - (("\\From 4ec93a7d398693bc35584b7c287cd49cdfcf2d8f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:12:00 -0400 Subject: [PATCH 3/7] gnu: docker: Harmonize LookPath regexes. * gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at the start of the word, like it's done later. --- gnu/packages/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 10aa3aa5b4..6e598e4d18 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -375,7 +375,7 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.LookPath\\(\"" + ((#,(string-append "\\datum #'source-text) "\")")) @@ -389,7 +389,7 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "exec\\.Command\\(\"" + ((#,(string-append "\\datum #'source-text) "\"")) -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-docker-Make-macros-use-a-relative-path-as-argume.patch >From e6d6211902463da59ed4716c14334c88907c26c0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:57:33 -0400 Subject: [PATCH 4/7] gnu: docker: Make macros use a relative path as argument. * gnu/packages/docker.scm (docker)[phases]: Move implementation detail inside the SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND macros definition, so that the relative path argument can be given as a relative path. --- gnu/packages/docker.scm | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 6e598e4d18..0b602cee1d 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -381,7 +381,7 @@ built-in registry server of Docker.") "\")")) (string-append "\"" (assoc-ref inputs package) - relative-path + "/" relative-path "\", error(nil)"))))))) (substitute-Command (lambda (x) @@ -395,29 +395,29 @@ built-in registry server of Docker.") "\"")) (string-append "exec.Command(\"" (assoc-ref inputs package) - relative-path + "/" relative-path "\"")))))))) - (substitute-LookPath "ps" "procps" "/bin/ps") - (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs") - (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdiskscan") - (substitute-LookPath "pvdisplay" "lvm2" "/sbin/pvdisplay") - (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") - (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") - (substitute-LookPath "iptables" "iptables" "/sbin/iptables") - (substitute-LookPath "iptables-legacy" "iptables" "/sbin/iptables") - (substitute-LookPath "ip" "iproute2" "/sbin/ip") - (substitute-Command "modprobe" "kmod" "/bin/modprobe") - (substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate") - (substitute-Command "vgcreate" "lvm2" "/sbin/vgcreate") - (substitute-Command "lvcreate" "lvm2" "/sbin/lvcreate") - (substitute-Command "lvconvert" "lvm2" "/sbin/lvconvert") - (substitute-Command "lvchange" "lvm2" "/sbin/lvchange") - (substitute-Command "mkfs.xfs" "xfsprogs" "/sbin/mkfs.xfs") - (substitute-Command "xfs_growfs" "xfsprogs" "/sbin/xfs_growfs") - (substitute-Command "mkfs.ext4" "e2fsprogs" "/sbin/mkfs.ext4") - (substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2fs") - (substitute-Command "blkid" "util-linux" "/sbin/blkid") - (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs") + (substitute-LookPath "ps" "procps" "bin/ps") + (substitute-LookPath "mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") + (substitute-LookPath "lvmdiskscan" "lvm2" "sbin/lvmdiskscan") + (substitute-LookPath "pvdisplay" "lvm2" "sbin/pvdisplay") + (substitute-LookPath "blkid" "util-linux" "sbin/blkid") + (substitute-LookPath "unpigz" "pigz" "bin/unpigz") + (substitute-LookPath "iptables" "iptables" "sbin/iptables") + (substitute-LookPath "iptables-legacy" "iptables" "sbin/iptables") + (substitute-LookPath "ip" "iproute2" "sbin/ip") + (substitute-Command "modprobe" "kmod" "bin/modprobe") + (substitute-Command "pvcreate" "lvm2" "sbin/pvcreate") + (substitute-Command "vgcreate" "lvm2" "sbin/vgcreate") + (substitute-Command "lvcreate" "lvm2" "sbin/lvcreate") + (substitute-Command "lvconvert" "lvm2" "sbin/lvconvert") + (substitute-Command "lvchange" "lvm2" "sbin/lvchange") + (substitute-Command "mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") + (substitute-Command "xfs_growfs" "xfsprogs" "sbin/xfs_growfs") + (substitute-Command "mkfs.ext4" "e2fsprogs" "sbin/mkfs.ext4") + (substitute-Command "tune2fs" "e2fsprogs" "sbin/tune2fs") + (substitute-Command "blkid" "util-linux" "sbin/blkid") + (substitute-Command "resize2fs" "e2fsprogs" "sbin/resize2fs") ;; docker-mountfrom ?? ;; docker ;; docker-untar ?? @@ -425,11 +425,11 @@ built-in registry server of Docker.") ;; /usr/bin/uname ;; grep ;; apparmor_parser - (substitute-Command "ps" "procps" "/bin/ps") - (substitute-Command "losetup" "util-linux" "/sbin/losetup") - (substitute-Command "uname" "coreutils" "/bin/uname") - (substitute-Command "dbus-launch" "dbus" "/bin/dbus-launch") - (substitute-Command "git" "git" "/bin/git")) + (substitute-Command "ps" "procps" "bin/ps") + (substitute-Command "losetup" "util-linux" "sbin/losetup") + (substitute-Command "uname" "coreutils" "bin/uname") + (substitute-Command "dbus-launch" "dbus" "bin/dbus-launch") + (substitute-Command "git" "git" "bin/git")) ;; Make compilation fail when, in future versions, Docker ;; invokes other programs we don't know about and thus don't ;; substitute. -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-docker-Optimize-substitution-macros.patch >From aa63b48d0d4a5d48d745e9be8e7222e9f73f0af8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:00:45 -0400 Subject: [PATCH 5/7] gnu: docker: Optimize substitution macros. This change halves the time needed to patch the paths. * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Allow passing multiple SOURCE-TEXT, PACKAGE and RELATIVE-PATH tuples so that the rewrite rules can be generated and processed by a single use of the SUBSTITUTE* macro. Rename SUBSTITUTE-LOOKPATH to SUBSTITUTE-LOOKPATH* and substitute-Command to SUBSTITUTE-COMMAND* to denote the change. Adapt the uses of SUBSTITUTE-LOOKPATH* and SUBSTITUTE-COMMAND*. --- gnu/packages/docker.scm | 120 ++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0b602cee1d..912827b79b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -369,67 +369,65 @@ built-in registry server of Docker.") (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) (find-files "." "\\.go$")))) - (let-syntax ((substitute-LookPath - (lambda (x) - (syntax-case x () - ((substitute-LookPath source-text package - relative-path) - #`(substitute* source-files - ((#,(string-append "\\datum - #'source-text) - "\")")) - (string-append "\"" - (assoc-ref inputs package) - "/" relative-path - "\", error(nil)"))))))) - (substitute-Command - (lambda (x) - (syntax-case x () - ((substitute-LookPath source-text package - relative-path) - #`(substitute* source-files - ((#,(string-append "\\datum - #'source-text) - "\"")) - (string-append "exec.Command(\"" - (assoc-ref inputs package) - "/" relative-path - "\"")))))))) - (substitute-LookPath "ps" "procps" "bin/ps") - (substitute-LookPath "mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") - (substitute-LookPath "lvmdiskscan" "lvm2" "sbin/lvmdiskscan") - (substitute-LookPath "pvdisplay" "lvm2" "sbin/pvdisplay") - (substitute-LookPath "blkid" "util-linux" "sbin/blkid") - (substitute-LookPath "unpigz" "pigz" "bin/unpigz") - (substitute-LookPath "iptables" "iptables" "sbin/iptables") - (substitute-LookPath "iptables-legacy" "iptables" "sbin/iptables") - (substitute-LookPath "ip" "iproute2" "sbin/ip") - (substitute-Command "modprobe" "kmod" "bin/modprobe") - (substitute-Command "pvcreate" "lvm2" "sbin/pvcreate") - (substitute-Command "vgcreate" "lvm2" "sbin/vgcreate") - (substitute-Command "lvcreate" "lvm2" "sbin/lvcreate") - (substitute-Command "lvconvert" "lvm2" "sbin/lvconvert") - (substitute-Command "lvchange" "lvm2" "sbin/lvchange") - (substitute-Command "mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") - (substitute-Command "xfs_growfs" "xfsprogs" "sbin/xfs_growfs") - (substitute-Command "mkfs.ext4" "e2fsprogs" "sbin/mkfs.ext4") - (substitute-Command "tune2fs" "e2fsprogs" "sbin/tune2fs") - (substitute-Command "blkid" "util-linux" "sbin/blkid") - (substitute-Command "resize2fs" "e2fsprogs" "sbin/resize2fs") - ;; docker-mountfrom ?? - ;; docker - ;; docker-untar ?? - ;; docker-applyLayer ?? - ;; /usr/bin/uname - ;; grep - ;; apparmor_parser - (substitute-Command "ps" "procps" "bin/ps") - (substitute-Command "losetup" "util-linux" "sbin/losetup") - (substitute-Command "uname" "coreutils" "bin/uname") - (substitute-Command "dbus-launch" "dbus" "bin/dbus-launch") - (substitute-Command "git" "git" "bin/git")) + (let-syntax ((substitute-LookPath* + (syntax-rules () + ((_ (source-text package relative-path) ...) + (substitute* source-files + (((string-append "\\From a2d9cbcc7ad2c86767ff77e026956d07025c5e27 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:48:09 -0400 Subject: [PATCH 6/7] gnu: docker: Patch the reference to the docker proxy. * gnu/packages/docker.scm (docker)[inputs]: Add docker-libnetwork-cmd-proxy. * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Patch proxy.go to refer to the docker-proxy binary by its absolute path. --- gnu/packages/docker.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 912827b79b..9dde4c6cb0 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -366,6 +366,11 @@ built-in registry server of Docker.") (("var defaultCommandCandidates = .*") (string-append "var defaultCommandCandidates = []string{\"" (assoc-ref inputs "runc") "/sbin/runc\"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" + (("var userlandProxyCommandName = .*") + (string-append "var userlandProxyCommandName = \"" + (assoc-ref inputs "docker-proxy") + "/bin/proxy\"\n"))) (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) (find-files "." "\\.go$")))) @@ -513,6 +518,7 @@ built-in registry server of Docker.") ("containerd" ,containerd) ; for containerd-shim ("coreutils" ,coreutils) ("dbus" ,dbus) + ("docker-proxy" ,docker-libnetwork-cmd-proxy) ("e2fsprogs" ,e2fsprogs) ("git" ,git) ("iproute2" ,iproute) -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0007-gnu-docker-Refer-to-xz-by-its-absolute-path.patch >From 646c93fa6a2a75b877153da6c006fd3a17c8dd32 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:58:55 -0400 Subject: [PATCH 7/7] gnu: docker: Refer to xz by its absolute path. * gnu/packages/docker.scm (docker)[inputs]: Add xz. [phases]{patch-paths}: Patch the reference to xz. --- gnu/packages/docker.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 9dde4c6cb0..78bff8a323 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -371,6 +371,9 @@ built-in registry server of Docker.") (string-append "var userlandProxyCommandName = \"" (assoc-ref inputs "docker-proxy") "/bin/proxy\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) (find-files "." "\\.go$")))) @@ -530,7 +533,8 @@ built-in registry server of Docker.") ("runc" ,runc) ("util-linux" ,util-linux) ("lvm2" ,lvm2) - ("xfsprogs" ,xfsprogs))) + ("xfsprogs" ,xfsprogs) + ("xz" ,xz))) (native-inputs `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) ("go" ,go) -- 2.20.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 20:14:39 2019 Received: (at control) by debbugs.gnu.org; 15 Apr 2019 00:14:39 +0000 Received: from localhost ([127.0.0.1]:33396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpGh-0005dx-4i for submit@debbugs.gnu.org; Sun, 14 Apr 2019 20:14:39 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:45560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpGf-0005dk-ET for control@debbugs.gnu.org; Sun, 14 Apr 2019 20:14:37 -0400 Received: by mail-qt1-f175.google.com with SMTP id v20so17218376qtv.12 for ; Sun, 14 Apr 2019 17:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=MMmWPkB9ycWzZiYqHmLvyVlgTR1lINFtN9qeoEITz0c=; b=sjiCm7ZbwIEbIrlANtE6y210OKIKdfOojIzBEZlTrX1iv9Btx6d5f+XhY7koqiQDJP XS2J+AbdGRPEMb+IJtgJR/ywQgdQGWOeWC6iiyeFxh8fXs2Z61pziCO7AIeqc6Xbh4Pk AI5hEJe/57mmE5TbkhpXy65JVwTdJvQ77GasVCCwcdfQAf/J1cGTNqya/1kp4wRuf4zH qOhmwoTQfA2XGSmD6FtAfEai190Ghq/0oZXPjFfjOlwo7yCeW8acEjse7jICvVZreBFL aLKSvIWmVQJcTngKAWeYGdctBxeMlgUK2FhDbptcKYKC7N3k5pFPHkL23OFbG6lxhrcK 3nJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=MMmWPkB9ycWzZiYqHmLvyVlgTR1lINFtN9qeoEITz0c=; b=eN+j7rsSAYRbtqJ4aVHQww0Gh8bFQK5SqT3mtDzm4xSW8SFrhha+wyk+oshxJwHOVL a8MZ/0BnfuJw/+ltauODqFtee9RZwO9gI480nAVglCl3RtoP3n2jm26avSjjcQH0eAM3 NUe7fjkMRvBVYU5atrg9yRjFN7y/bWksTKEgCNy5m8BIhIIpG1vlRmGPSji9Kcflo7ge mv8Bpg8sPhl1tlJrlmV6pjp2PO7GIaJFlHAK0v51Th3AS7WSvceYokv9xCNccVAl5kKH lQE3M9ONQQ+uRsZ8H38hp8fTna2WzBxR/k5GxZZHwd7yl2gwQP+wLbYsVSLeMsdPeAGv nDQQ== X-Gm-Message-State: APjAAAWrWPiu3yRpcEj/SWmrZlu8NA2aB3765PSa/LT+FTWMR8SV0Q9T MyxDTsSn8IHovwuO0g3GvrBfVKb4 X-Google-Smtp-Source: APXvYqzoB106t7ypPIjIRI22OAGU7rwEsnQm+efwpt18hnov8Vx7/8ApaLfDPqqHH88X2bMwg3cM6A== X-Received: by 2002:aed:3948:: with SMTP id l66mr57306911qte.309.1555287271865; Sun, 14 Apr 2019 17:14:31 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id c84sm27666312qke.0.2019.04.14.17.14.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 17:14:31 -0700 (PDT) Date: Sun, 14 Apr 2019 20:14:30 -0400 Message-Id: <87ftqknmzd.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #35282 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 35282 by 35281 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 01:56:41 2019 Received: (at 35282) by debbugs.gnu.org; 15 Apr 2019 05:56:41 +0000 Received: from localhost ([127.0.0.1]:33574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFubh-0007iV-5m for submit@debbugs.gnu.org; Mon, 15 Apr 2019 01:56:41 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:33416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFubf-0007iN-DZ for 35282@debbugs.gnu.org; Mon, 15 Apr 2019 01:56:40 -0400 Received: from localhost (188-22-89-123.adsl.highway.telekom.at [188.22.89.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8BE773360CCB; Mon, 15 Apr 2019 07:56:37 +0200 (CEST) Date: Mon, 15 Apr 2019 07:56:32 +0200 From: Danny Milosavljevic To: Maxim Cournoyer Subject: Re: [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy. Message-ID: <20190415075632.3a5802e8@scratchpost.org> In-Reply-To: <87h8b0nn1z.fsf@gmail.com> References: <87h8b0nn1z.fsf@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35282 Cc: 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable >diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm >index 10aa3aa5b4..6e598e4d18 100644 >--- a/gnu/packages/docker.scm >+++ b/gnu/packages/docker.scm >@@ -375,7 +375,7 @@ built-in registry server of Docker.") > ((substitute-LookPath source-text package > relative-path) > #`(substitute* source-files >- ((#,(string-append "exec\\.LookPath= \\(\"" >+ ((#,(string-append "\\ (syntax->datum > #'source-text) > "\")")) >@@ -389,7 +389,7 @@ built-in registry server of Docker.") > ((substitute-LookPath source-text package > relative-path) > #`(substitute* source-files >- ((#,(string-append "exec\\.Command\= \(\"" >+ ((#,(string-append "\\ (syntax->datum > #'source-text) "\"") Then it wouldn't match those: ./builder/dockerfile/copy_windows.go: cmd :=3D reexec.Command("windows-fi= x-permissions", source, destination, identity.SID) ./daemon/graphdriver/overlay2/mount.go: cmd :=3D reexec.Command("docker-mou= ntfrom", dir) ./daemon/graphdriver/windows/windows.go: cmd :=3D reexec.Com= mand(append([]string{"docker-windows-write-layer", d.info.HomeDir, id}, par= entLayerPaths...)...) ./pkg/chrootarchive/archive_unix.go: cmd :=3D reexec.Command("docker-unt= ar", dest) ./pkg/chrootarchive/diff_unix.go: cmd :=3D reexec.Command("docker-app= lyLayer", dest) Why did you change it? --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAly0HRAACgkQ5xo1VCww uqXNaQgAoV3aPasART/+/znvV6bExbKfoPbfqlxYLjOnwD/06ZHZcj+6JJkDTEtS rgXiJ2FfjmjqaBm2M+VEPgkhz7IjNDUL1pGkCHmhHvNP/tD1sqb7cdIsYQ7DpSbG 0LUTvOb04y0HGSEoQaXvg3FlYMW7ErekHZFkWnZkJ2W8/pfoVdrKRvsvFXGQzDqW +OaEEXq4V8viDCHAusI0K0C8zSlgvLoCs9Lv2djjxcpGoUNcpkLbReF28PDUy5QG k+CelY4MG8JTRueUzHz8jNrlqBN/MxxitHeqoGmYp1ypN3/EBhCs0+bFhfctj9R6 eiBcRw2L6Qn7oAm7S43RBMQYLg/BqQ== =b+5/ -----END PGP SIGNATURE----- --Sig_/xlE8a4q.Kc7qk9w8x8F9Q+k-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 15:06:06 2019 Received: (at 35282) by debbugs.gnu.org; 15 Apr 2019 19:06:06 +0000 Received: from localhost ([127.0.0.1]:35432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG6ve-0001K0-HZ for submit@debbugs.gnu.org; Mon, 15 Apr 2019 15:06:06 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:40084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG6vZ-0001JM-En for 35282@debbugs.gnu.org; Mon, 15 Apr 2019 15:06:04 -0400 Received: by mail-qk1-f194.google.com with SMTP id w20so10564339qka.7 for <35282@debbugs.gnu.org>; Mon, 15 Apr 2019 12:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=79hCJmamCFXygd5S3ytz9DrOtaBMgQ0V0jkETGpx0gM=; b=n8sM+vItfUMp+DW5PBIMCh5ecqYT7Qylr87FuOPGRpGllxIHngWG2bDr7igm5ulcfS xUizT/v65+fr1MtFnUEaFvjqOE5xToSgFIGqKNAtB/5+3ilLkf86ZuGXhtL4Ak4n1O3J gZAAG5DIv/KwaGmOv2RGIzOK40z/jwlvRA93yEVCfYPFNyKVgrDqf1DuCz07Kg8K2HPm HlL/1MkI9R4z6mmyiTL5R3SriEcRk9heA/rhC0psCNh/4MNfa8ToLaGTvQRPUectPFq6 I4/l5skWTs2i5NJYcBTAc6OtV4ryU2KL+YnVg0PzehN4vgfVLJb3rvTMbR+qD/SeIA8j TeGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=79hCJmamCFXygd5S3ytz9DrOtaBMgQ0V0jkETGpx0gM=; b=KJ90XPgT8UcWQvk7x0w5QnJZ088pSRKVuZJI0ZKHykp39H5NrhKmWXJ4Fj1pMf674Z +oimhhIdNto2NpjzQ4OMd3XcM0jBM/RA55Hk7zEOeo1Z7v9FceKlFLWjDEK04kcu3JwY /P3lujfFnp5PK6hqMoWqHM+z3TG5oDHogh9rg5qcQdO/NUgIBWpFdq0djoNphEMOdCGm x2VuAfCRujUIm4wzrFfOHw2lO5VOBwxSLK57Lq4GHOB8EeVtvSyT4CVn41PTjPkHOP2H M/Nnt0OzvX98V4Ztv9wxr9B0lloNXJjtsnNh2Ms3xTUTU9z7Cz4GeV6i04txildKVILs YWNQ== X-Gm-Message-State: APjAAAXWpzKVa+z5evWkAE8oPOL99Fiplip1xHkxSgUPrwWAXnU2JmmD QF9Bv0TcHIqgthi8wvJiGU05T8mZ X-Google-Smtp-Source: APXvYqwR4wSSmoNFYjZnG+Q8u0EYeiaGEl809LaDYYhDeT5EyUuoWDCuGxU2gYPRW0x3QXEWNTXxPg== X-Received: by 2002:a37:de04:: with SMTP id h4mr57931375qkj.196.1555355155704; Mon, 15 Apr 2019 12:05:55 -0700 (PDT) Received: from kwak (dsl-158-139.b2b2c.ca. [66.158.158.139]) by smtp.gmail.com with ESMTPSA id o50sm33605818qtc.23.2019.04.15.12.05.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 12:05:54 -0700 (PDT) From: Maxim Cournoyer To: Danny Milosavljevic Subject: Re: [bug#35282] [PATCH] gnu: docker: Patch paths of xz and docker-proxy. References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> Date: Mon, 15 Apr 2019 15:05:53 -0400 In-Reply-To: <20190415075632.3a5802e8@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 07:56:32 +0200") Message-ID: <87h8azm6lq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 35282 Cc: 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Danny! Danny Milosavljevic writes: >>diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm >>index 10aa3aa5b4..6e598e4d18 100644 >>--- a/gnu/packages/docker.scm >>+++ b/gnu/packages/docker.scm >>@@ -375,7 +375,7 @@ built-in registry server of Docker.") >> ((substitute-LookPath source-text package >> relative-path) >> #`(substitute* source-files >>- ((#,(string-append "exec\\.LookPath\\(\"" >>+ ((#,(string-append "\\> (syntax->datum >> #'source-text) >> "\")")) >>@@ -389,7 +389,7 @@ built-in registry server of Docker.") >> ((substitute-LookPath source-text package >> relative-path) >> #`(substitute* source-files >>- ((#,(string-append "exec\\.Command\\(\"" >>+ ((#,(string-append "\\> (syntax->datum >> #'source-text) > "\"") > Then it wouldn't match those: > > ./builder/dockerfile/copy_windows.go: cmd := reexec.Command("windows-fix-permissions", source, destination, identity.SID) > ./daemon/graphdriver/overlay2/mount.go: cmd := reexec.Command("docker-mountfrom", dir) > ./daemon/graphdriver/windows/windows.go: cmd := reexec.Command(append([]string{"docker-windows-write-layer", d.info.HomeDir, id}, parentLayerPaths...)...) > ./pkg/chrootarchive/archive_unix.go: cmd := reexec.Command("docker-untar", dest) > ./pkg/chrootarchive/diff_unix.go: cmd := reexec.Command("docker-applyLayer", dest) Those are currently commented out (not in the actual code), so it was working with the change, but thanks for bringing this to my attention. > Why did you change it? As the commit message says, it was to harmonize the macros' regexes with the other regexes found in later substitute* uses. I didn't see the need to have different flavors of the same. I suggest amending my patch with: --8<---------------cut here---------------start------------->8--- @@ -389,7 +389,7 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files - ((#,(string-append "\\datum #'source-text) "\"")) --8<---------------cut here---------------end--------------->8--- To be future proof. What do you think? Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 16:19:25 2019 Received: (at 35282) by debbugs.gnu.org; 15 Apr 2019 20:19:25 +0000 Received: from localhost ([127.0.0.1]:35566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG84a-0003IT-Ls for submit@debbugs.gnu.org; Mon, 15 Apr 2019 16:19:25 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:43862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG84X-0003IA-4W for 35282@debbugs.gnu.org; Mon, 15 Apr 2019 16:19:22 -0400 Received: by mail-qt1-f173.google.com with SMTP id v32so20704483qtc.10 for <35282@debbugs.gnu.org>; Mon, 15 Apr 2019 13:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=V38oQRGAKS2fQ6P8e4wxXJf9nOhNPX0tJRFO9QbnpYk=; b=awjVJ1H6tQhH9IO/pglJS+qZrHr/H9fcIQ3O0oChP16Wp5HQuyja2+25SA7tlel788 aY/9IJc//cUcHCe3VMJL5jcdLoVLm7h+4HnY6EKqUQAkQgBjOLGlnfPcMgts8GJh4GlM 3QURwtC9f21KS61xsnA6Tw7Ph9WEBFu800gj5YXUFKLUaDgrvmSGeK1bF9eqONlPsYY/ TjbtSjENuTjW68tRUlAbfm8wDspft4G6TD2/4uVSob7Jj1+ETMg10Nnjx3X7EsqK7byA oU/TZO8cJvuI9Wuo2GxEtamdFhu9KvVv/U+xhmhCjAILbuEohd5u8/X0ImqbIWvGsSQc Baog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=V38oQRGAKS2fQ6P8e4wxXJf9nOhNPX0tJRFO9QbnpYk=; b=GAjaQnK2VGtN7T8VdFb9k7UqOzk++5M7QlpzMTohOXckcPqFmekIFFWaUVG9FS2alH bN8fiCz7XSpoxpzW4x4AgzuJZLvFUczR4ViUfamE38Z7UCCzZyBAd+Y6Pmv0nh1yRFua Ijpckx3N5pIICyP82e1S/UNMikGZZIYE7IBO9j8jKt0AQ1N6KlWWvN/L353tOIj7xQYq afkKhXkmcald1vV7eGsKoxx2HeaNXJhRLQD1JQSJ0Zht+YoUvxwLtwNhXZv95eHzAGkL Zg8/Sg8oToPd1Lc3QaquNdyaWdn4FyHWCvU90j8XrBdZD2jznCDeNC4f5TqFMnT8aakQ Zx9w== X-Gm-Message-State: APjAAAW92EnLPjaGzm5fcXJ6WQ7Ae79NSgvRMSiHBezUbzKJkCZtB0OQ C+NzFpNxcTulCiibJsEM+yNImXh9 X-Google-Smtp-Source: APXvYqwZ3Wd7g4rdmGtQHqRZ4bsHPF3Sdb2tNn1Qg2zcH5+e8frWVENXnbJhiuhlvS4A05hI7+2HwQ== X-Received: by 2002:a0c:f806:: with SMTP id r6mr60162888qvn.188.1555359555233; Mon, 15 Apr 2019 13:19:15 -0700 (PDT) Received: from kwak (dsl-158-139.b2b2c.ca. [66.158.158.139]) by smtp.gmail.com with ESMTPSA id n201sm28303176qka.10.2019.04.15.13.19.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 13:19:14 -0700 (PDT) From: Maxim Cournoyer To: Danny Milosavljevic Subject: Re: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> Date: Mon, 15 Apr 2019 16:19:12 -0400 In-Reply-To: <20190415075632.3a5802e8@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 07:56:32 +0200") Message-ID: <87bm17m37j.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35282 Cc: 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello again, Actually, the proposed change was not sufficient, as it would transform reexec.Command -> exec.Command. The attached series fixes it (patch 0003, with the other rebased). --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-docker-Fix-indentation.patch Content-Transfer-Encoding: quoted-printable From=201405716eff1c15bf2a44704f4a32e6e823f73bf2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 21:55:48 -0400 Subject: [PATCH 1/7] gnu: docker: Fix indentation. * gnu/packages/docker.scm (docker): Fix indentation using Emacs. =2D-- gnu/packages/docker.scm | 184 ++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 1067555296..7445856347 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -299,17 +299,17 @@ built-in registry server of Docker.") (version %docker-version) (source (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://github.com/docker/engine.git") =2D (commit (string-append "v" version)))) =2D (file-name (git-file-name name version)) =2D (sha256 =2D (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) =2D (patches =2D (search-patches "docker-engine-test-noinstall.patch" =2D "docker-fix-tests.patch" =2D "docker-use-fewer-modprobes.patch")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/engine.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06yr5xwr181lalh8z1lk07nxlp7hn38aq8cyqjk617dfy4lz0ixx")) + (patches + (search-patches "docker-engine-test-noinstall.patch" + "docker-fix-tests.patch" + "docker-use-fewer-modprobes.patch")))) (build-system gnu-build-system) (arguments `(#:modules @@ -326,77 +326,77 @@ built-in registry server of Docker.") (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "builder/builder-next/executor_unix.go" =2D (("CommandCandidates:.*runc.*") =2D (string-append "CommandCandidates: []string{\"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"},\n"))) + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (assoc-ref inputs "runc") + "/sbin/runc\"},\n"))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" =2D (("DefaultCommand =3D .*") =2D (string-append "DefaultCommand =3D \"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"\n"))) + (("DefaultCommand =3D .*") + (string-append "DefaultCommand =3D \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "vendor/github.com/containerd/containerd/runtime= /v1/linux/runtime.go" =2D (("defaultRuntime[ \t]*=3D.*") =2D (string-append "defaultRuntime =3D \"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"\n")) =2D (("defaultShim[ \t]*=3D.*") =2D (string-append "defaultShim =3D \"" =2D (assoc-ref inputs "containerd") =2D "/bin/containerd-shim\"\n"))) + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (assoc-ref inputs "containerd") + "/bin/containerd-shim\"\n"))) (substitute* "daemon/daemon_unix.go" =2D (("DefaultShimBinary =3D .*") =2D (string-append "DefaultShimBinary =3D \"" =2D (assoc-ref inputs "containerd") =2D "/bin/containerd-shim\"\n")) =2D (("DefaultRuntimeBinary =3D .*") =2D (string-append "DefaultRuntimeBinary =3D \"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"\n")) =2D (("DefaultRuntimeName =3D .*") =2D (string-append "DefaultRuntimeName =3D \"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"\n"))) + (("DefaultShimBinary =3D .*") + (string-append "DefaultShimBinary =3D \"" + (assoc-ref inputs "containerd") + "/bin/containerd-shim\"\n")) + (("DefaultRuntimeBinary =3D .*") + (string-append "DefaultRuntimeBinary =3D \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("DefaultRuntimeName =3D .*") + (string-append "DefaultRuntimeName =3D \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" =2D (("StockRuntimeName =3D .*") =2D (string-append "StockRuntimeName =3D \"" =2D (assoc-ref inputs "runc") =2D "/sbin/runc\"\n"))) + (("StockRuntimeName =3D .*") + (string-append "StockRuntimeName =3D \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) (substitute* "vendor/github.com/moby/buildkit/executor/runcex= ecutor/executor.go" =2D (("var defaultCommandCandidates =3D .*") =2D (string-append "var defaultCommandCandidates =3D []string= {\"" =2D (assoc-ref inputs "runc") "/sbin/runc\"}")= )) + (("var defaultCommandCandidates =3D .*") + (string-append "var defaultCommandCandidates =3D []string{= \"" + (assoc-ref inputs "runc") "/sbin/runc\"}"))) (let ((source-files (filter (lambda (name) =2D (not (string-contains name "test"))) =2D (find-files "." "\\.go$")))) + (not (string-contains name "tes= t"))) + (find-files "." "\\.go$")))) (let-syntax ((substitute-LookPath (lambda (x) (syntax-case x () ((substitute-LookPath source-text package relative-path) #`(substitute* source-files =2D ((#,(string-append "exec\\.LookPath= \\(\"" =2D (syntax->datum =2D #'source-text) =2D "\")")) =2D (string-append "\"" =2D (assoc-ref inputs p= ackage) =2D relative-path =2D "\", error(nil)")))= )))) + ((#,(string-append "exec\\.LookPath\= \(\"" + (syntax->datum + #'source-text) + "\")")) + (string-append "\"" + (assoc-ref inputs pa= ckage) + relative-path + "\", error(nil)"))))= ))) (substitute-Command (lambda (x) (syntax-case x () ((substitute-LookPath source-text package relative-path) #`(substitute* source-files =2D ((#,(string-append "exec\\.Command\= \(\"" =2D (syntax->datum =2D #'source-text) =2D "\"")) ; ) =2D (string-append "exec.Command(\"" =2D (assoc-ref inputs p= ackage) =2D relative-path =2D "\"")))))))) ; ) + ((#,(string-append "exec\\.Command\\= (\"" + (syntax->datum + #'source-text) + "\"")) ; ) + (string-append "exec.Command(\"" + (assoc-ref inputs pa= ckage) + relative-path + "\"")))))))) ; ) (substitute-LookPath "ps" "procps" "/bin/ps") (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs= ") (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdisks= can") @@ -418,13 +418,13 @@ built-in registry server of Docker.") (substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2fs") (substitute-Command "blkid" "util-linux" "/sbin/blkid") (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize= 2fs") =2D; docker-mountfrom ?? =2D; docker =2D; docker-untar ?? =2D; docker-applyLayer ?? =2D; /usr/bin/uname =2D; grep =2D; apparmor_parser + ;; docker-mountfrom ?? + ;; docker + ;; docker-untar ?? + ;; docker-applyLayer ?? + ;; /usr/bin/uname + ;; grep + ;; apparmor_parser (substitute-Command "ps" "procps" "/bin/ps") (substitute-Command "losetup" "util-linux" "/sbin/losetup= ") (substitute-Command "uname" "coreutils" "/bin/uname") @@ -434,24 +434,24 @@ built-in registry server of Docker.") ;; invokes other programs we don't know about and thus don't ;; substitute. (substitute* source-files =2D ;; Search for Java in PATH. =2D (("\\ .pc) + `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> = .pc) ("go" ,go) ("pkg-config" ,pkg-config))) (synopsis "Docker container component library, and daemon") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-docker-Cleanup-extraneous-comments.patch Content-Transfer-Encoding: quoted-printable From=2064b8226b954c18aa9fd246c26b8c5958fa5d2e86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:08:52 -0400 Subject: [PATCH 2/7] gnu: docker: Cleanup extraneous comments. * gnu/packages/docker.scm (docker): Remove "parenthesis-balancing" comments. =2D-- gnu/packages/docker.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7445856347..10aa3aa5b4 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -392,11 +392,11 @@ built-in registry server of Docker.") ((#,(string-append "exec\\.Command\\= (\"" (syntax->datum #'source-text) =2D "\"")) ; ) + "\"")) (string-append "exec.Command(\"" (assoc-ref inputs pa= ckage) relative-path =2D "\"")))))))) ; ) + "\"")))))))) (substitute-LookPath "ps" "procps" "/bin/ps") (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.xfs= ") (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdisks= can") @@ -435,22 +435,22 @@ built-in registry server of Docker.") ;; substitute. (substitute* source-files ;; Search for Java in PATH. =2D (("\\ Date: Thu, 11 Apr 2019 22:12:00 -0400 Subject: [PATCH 3/7] gnu: docker: Harmonize LookPath regexes. * gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at = the start of the word, like it's done later. =2D-- gnu/packages/docker.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 10aa3aa5b4..ce9d4d4643 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -375,7 +375,7 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files =2D ((#,(string-append "exec\\.LookPat= h\\(\"" + ((#,(string-append "\\datum #'source-text) "\")")) @@ -389,11 +389,12 @@ built-in registry server of Docker.") ((substitute-LookPath source-text package relative-path) #`(substitute* source-files =2D ((#,(string-append "exec\\.Command= \\(\"" + ((#,(string-append "\\<(re)?exec\\.C= ommand\\(\"" (syntax->datum #'source-text) =2D "\"")) =2D (string-append "exec.Command(\"" + "\"") _ re?) + (string-append (if re? re? "") + "exec.Command(\"" (assoc-ref inputs pa= ckage) relative-path "\"")))))))) =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-docker-Make-macros-use-a-relative-path-as-argume.patch Content-Transfer-Encoding: quoted-printable From=208776742130efab07e2f00287d039ec2fbf5e21bf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 11 Apr 2019 22:57:33 -0400 Subject: [PATCH 4/7] gnu: docker: Make macros use a relative path as argume= nt. * gnu/packages/docker.scm (docker)[phases]: Move implementation detail insi= de the SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND macros definition, so that t= he relative path argument can be given as a relative path. =2D-- gnu/packages/docker.scm | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index ce9d4d4643..f6e0e813ba 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -381,7 +381,7 @@ built-in registry server of Docker.") "\")")) (string-append "\"" (assoc-ref inputs pa= ckage) =2D relative-path + "/" relative-path "\", error(nil)"))))= ))) (substitute-Command (lambda (x) @@ -396,29 +396,29 @@ built-in registry server of Docker.") (string-append (if re? re? "") "exec.Command(\"" (assoc-ref inputs pa= ckage) =2D relative-path + "/" relative-path "\"")))))))) =2D (substitute-LookPath "ps" "procps" "/bin/ps") =2D (substitute-LookPath "mkfs.xfs" "xfsprogs" "/bin/mkfs.x= fs") =2D (substitute-LookPath "lvmdiskscan" "lvm2" "/sbin/lvmdis= kscan") =2D (substitute-LookPath "pvdisplay" "lvm2" "/sbin/pvdispla= y") =2D (substitute-LookPath "blkid" "util-linux" "/sbin/blkid") =2D (substitute-LookPath "unpigz" "pigz" "/bin/unpigz") =2D (substitute-LookPath "iptables" "iptables" "/sbin/iptab= les") =2D (substitute-LookPath "iptables-legacy" "iptables" "/sbi= n/iptables") =2D (substitute-LookPath "ip" "iproute2" "/sbin/ip") =2D (substitute-Command "modprobe" "kmod" "/bin/modprobe") =2D (substitute-Command "pvcreate" "lvm2" "/sbin/pvcreate") =2D (substitute-Command "vgcreate" "lvm2" "/sbin/vgcreate") =2D (substitute-Command "lvcreate" "lvm2" "/sbin/lvcreate") =2D (substitute-Command "lvconvert" "lvm2" "/sbin/lvconvert= ") =2D (substitute-Command "lvchange" "lvm2" "/sbin/lvchange") =2D (substitute-Command "mkfs.xfs" "xfsprogs" "/sbin/mkfs.x= fs") =2D (substitute-Command "xfs_growfs" "xfsprogs" "/sbin/xfs_= growfs") =2D (substitute-Command "mkfs.ext4" "e2fsprogs" "/sbin/mkfs= .ext4") =2D (substitute-Command "tune2fs" "e2fsprogs" "/sbin/tune2f= s") =2D (substitute-Command "blkid" "util-linux" "/sbin/blkid") =2D (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resi= ze2fs") + (substitute-LookPath "ps" "procps" "bin/ps") + (substitute-LookPath "mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") + (substitute-LookPath "lvmdiskscan" "lvm2" "sbin/lvmdisksc= an") + (substitute-LookPath "pvdisplay" "lvm2" "sbin/pvdisplay") + (substitute-LookPath "blkid" "util-linux" "sbin/blkid") + (substitute-LookPath "unpigz" "pigz" "bin/unpigz") + (substitute-LookPath "iptables" "iptables" "sbin/iptables= ") + (substitute-LookPath "iptables-legacy" "iptables" "sbin/i= ptables") + (substitute-LookPath "ip" "iproute2" "sbin/ip") + (substitute-Command "modprobe" "kmod" "bin/modprobe") + (substitute-Command "pvcreate" "lvm2" "sbin/pvcreate") + (substitute-Command "vgcreate" "lvm2" "sbin/vgcreate") + (substitute-Command "lvcreate" "lvm2" "sbin/lvcreate") + (substitute-Command "lvconvert" "lvm2" "sbin/lvconvert") + (substitute-Command "lvchange" "lvm2" "sbin/lvchange") + (substitute-Command "mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") + (substitute-Command "xfs_growfs" "xfsprogs" "sbin/xfs_gro= wfs") + (substitute-Command "mkfs.ext4" "e2fsprogs" "sbin/mkfs.ex= t4") + (substitute-Command "tune2fs" "e2fsprogs" "sbin/tune2fs") + (substitute-Command "blkid" "util-linux" "sbin/blkid") + (substitute-Command "resize2fs" "e2fsprogs" "sbin/resize2= fs") ;; docker-mountfrom ?? ;; docker ;; docker-untar ?? @@ -426,11 +426,11 @@ built-in registry server of Docker.") ;; /usr/bin/uname ;; grep ;; apparmor_parser =2D (substitute-Command "ps" "procps" "/bin/ps") =2D (substitute-Command "losetup" "util-linux" "/sbin/loset= up") =2D (substitute-Command "uname" "coreutils" "/bin/uname") =2D (substitute-Command "dbus-launch" "dbus" "/bin/dbus-lau= nch") =2D (substitute-Command "git" "git" "/bin/git")) + (substitute-Command "ps" "procps" "bin/ps") + (substitute-Command "losetup" "util-linux" "sbin/losetup") + (substitute-Command "uname" "coreutils" "bin/uname") + (substitute-Command "dbus-launch" "dbus" "bin/dbus-launch= ") + (substitute-Command "git" "git" "bin/git")) ;; Make compilation fail when, in future versions, Docker ;; invokes other programs we don't know about and thus don't ;; substitute. =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-docker-Optimize-substitution-macros.patch Content-Transfer-Encoding: quoted-printable From=206599410beb1b71bfdd71658554cecc08d7471e3a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:00:45 -0400 Subject: [PATCH 5/7] gnu: docker: Optimize substitution macros. This change halves the time needed to patch the paths. * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Allow passing multiple SOURCE-TEXT, PACKAGE and RELATIVE-PATH tuples so that the rewrite rules can be generated and processed by a single use of the SUBSTITUTE* macro. Rename SUBSTITUTE-LOOKPATH to SUBSTITUTE-LOOKPATH* and substitute-Command to SUBSTITUTE-COMMAND* to denote the change. Adapt the uses of SUBSTITUTE-LOOKPATH* and SUBSTITUTE-COMMAND*. =2D-- gnu/packages/docker.scm | 122 ++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index f6e0e813ba..3cd989cfcb 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -369,68 +369,66 @@ built-in registry server of Docker.") (let ((source-files (filter (lambda (name) (not (string-contains name "tes= t"))) (find-files "." "\\.go$")))) =2D (let-syntax ((substitute-LookPath =2D (lambda (x) =2D (syntax-case x () =2D ((substitute-LookPath source-text packa= ge =2D relative-path) =2D #`(substitute* source-files =2D ((#,(string-append "\\datum =2D #'source-text) =2D "\")")) =2D (string-append "\"" =2D (assoc-ref inputs = package) =2D "/" relative-path =2D "\", error(nil)"))= ))))) =2D (substitute-Command =2D (lambda (x) =2D (syntax-case x () =2D ((substitute-LookPath source-text packa= ge =2D relative-path) =2D #`(substitute* source-files =2D ((#,(string-append "\\<(re)?exec\\= .Command\\(\"" =2D (syntax->datum =2D #'source-text) =2D "\"") _ re?) =2D (string-append (if re? re? "") =2D "exec.Command(\"" =2D (assoc-ref inputs = package) =2D "/" relative-path =2D "\"")))))))) =2D (substitute-LookPath "ps" "procps" "bin/ps") =2D (substitute-LookPath "mkfs.xfs" "xfsprogs" "bin/mkfs.xf= s") =2D (substitute-LookPath "lvmdiskscan" "lvm2" "sbin/lvmdisk= scan") =2D (substitute-LookPath "pvdisplay" "lvm2" "sbin/pvdisplay= ") =2D (substitute-LookPath "blkid" "util-linux" "sbin/blkid") =2D (substitute-LookPath "unpigz" "pigz" "bin/unpigz") =2D (substitute-LookPath "iptables" "iptables" "sbin/iptabl= es") =2D (substitute-LookPath "iptables-legacy" "iptables" "sbin= /iptables") =2D (substitute-LookPath "ip" "iproute2" "sbin/ip") =2D (substitute-Command "modprobe" "kmod" "bin/modprobe") =2D (substitute-Command "pvcreate" "lvm2" "sbin/pvcreate") =2D (substitute-Command "vgcreate" "lvm2" "sbin/vgcreate") =2D (substitute-Command "lvcreate" "lvm2" "sbin/lvcreate") =2D (substitute-Command "lvconvert" "lvm2" "sbin/lvconvert") =2D (substitute-Command "lvchange" "lvm2" "sbin/lvchange") =2D (substitute-Command "mkfs.xfs" "xfsprogs" "sbin/mkfs.xf= s") =2D (substitute-Command "xfs_growfs" "xfsprogs" "sbin/xfs_g= rowfs") =2D (substitute-Command "mkfs.ext4" "e2fsprogs" "sbin/mkfs.= ext4") =2D (substitute-Command "tune2fs" "e2fsprogs" "sbin/tune2fs= ") =2D (substitute-Command "blkid" "util-linux" "sbin/blkid") =2D (substitute-Command "resize2fs" "e2fsprogs" "sbin/resiz= e2fs") =2D ;; docker-mountfrom ?? =2D ;; docker =2D ;; docker-untar ?? =2D ;; docker-applyLayer ?? =2D ;; /usr/bin/uname =2D ;; grep =2D ;; apparmor_parser =2D (substitute-Command "ps" "procps" "bin/ps") =2D (substitute-Command "losetup" "util-linux" "sbin/losetu= p") =2D (substitute-Command "uname" "coreutils" "bin/uname") =2D (substitute-Command "dbus-launch" "dbus" "bin/dbus-laun= ch") =2D (substitute-Command "git" "git" "bin/git")) + (let-syntax ((substitute-LookPath* + (syntax-rules () + ((_ (source-text package relative-path) ...) + (substitute* source-files + (((string-append "\\ Date: Sat, 13 Apr 2019 22:48:09 -0400 Subject: [PATCH 6/7] gnu: docker: Patch the reference to the docker proxy. * gnu/packages/docker.scm (docker)[inputs]: Add docker-libnetwork-cmd-proxy. * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Patch proxy.go to refer to the docker-proxy binary by its absolute path. =2D-- gnu/packages/docker.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3cd989cfcb..16bc812dd7 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -366,6 +366,11 @@ built-in registry server of Docker.") (("var defaultCommandCandidates =3D .*") (string-append "var defaultCommandCandidates =3D []string{= \"" (assoc-ref inputs "runc") "/sbin/runc\"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmapper/= proxy.go" + (("var userlandProxyCommandName =3D .*") + (string-append "var userlandProxyCommandName =3D \"" + (assoc-ref inputs "docker-proxy") + "/bin/proxy\"\n"))) (let ((source-files (filter (lambda (name) (not (string-contains name "tes= t"))) (find-files "." "\\.go$")))) @@ -514,6 +519,7 @@ built-in registry server of Docker.") ("containerd" ,containerd) ; for containerd-shim ("coreutils" ,coreutils) ("dbus" ,dbus) + ("docker-proxy" ,docker-libnetwork-cmd-proxy) ("e2fsprogs" ,e2fsprogs) ("git" ,git) ("iproute2" ,iproute) =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0007-gnu-docker-Refer-to-xz-by-its-absolute-path.patch Content-Transfer-Encoding: quoted-printable From=209809ec36652d4949af65eb75755e9dd6d8da5c40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:58:55 -0400 Subject: [PATCH 7/7] gnu: docker: Refer to xz by its absolute path. * gnu/packages/docker.scm (docker)[inputs]: Add xz. [phases]{patch-paths}: Patch the reference to xz. =2D-- gnu/packages/docker.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 16bc812dd7..43071775e4 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -371,6 +371,9 @@ built-in registry server of Docker.") (string-append "var userlandProxyCommandName =3D \"" (assoc-ref inputs "docker-proxy") "/bin/proxy\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (assoc-ref inputs "xz") "/bin/x= z"))) (let ((source-files (filter (lambda (name) (not (string-contains name "tes= t"))) (find-files "." "\\.go$")))) @@ -531,7 +534,8 @@ built-in registry server of Docker.") ("runc" ,runc) ("util-linux" ,util-linux) ("lvm2" ,lvm2) =2D ("xfsprogs" ,xfsprogs))) + ("xfsprogs" ,xfsprogs) + ("xz" ,xz))) (native-inputs `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> = .pc) ("go" ,go) =2D-=20 2.20.1 --=-=-= Content-Type: text/plain Thanks! Maxim --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAly050AACgkQEmDkZILm NWJPGw//TbQ4cR0nzVMHaXRetzimwTch8HvhbI0gPQFFsaVJoMTnjLcpF5+J3pdA ip//mTjc/caoAy4bPMblTHdtbXJa19vGwRWCxsvDPrz95KW6LRKilyTdXL0TRAJW KcuP6h0vYj7TOtfdwBE6S8gYwfR57rPgOmD7sANRM3uBY61HD+s5F1ZIo3oHJ6/n SVVI0HdSgOrWgPbPHMN9gbuLZx3AbayLL3knnE8VM9BlHGVMWcYojE3CJGtSn1pX 3mFv+dEGNubfCnJ07Gea1NCtp8hvBqRjdPFobYXi640cPvrNPdQ5qaNhLOVwqZ4O WB+MMbBTtqiBLPhJI0BplwIvkfRbKGRkdW/badieXWPuclNiK1l3xWuuCXYBUnTg kbxnlrTPa1DfEtBADp/ngMhCrclSOon24YJBEIocqfQkI/0ir6N4s+3h9vS3nqLY gR/7h+Wv7DuvbDd5mCJ2YqTpxz4nAPFwSyrOcplVZdchHmvPPOmBL7VuFpgpxk7A BCtrwaUo5DL8R4t+w8i4QizFvdRN43MPsuYKm1136KYM1e065fEE+lnarqvmpCGO MOXr5lq1qEjLXdHRqIKo1C/QpD/gwRwwaKHJ07eWcTfuIt5mzTgNo9rC1ZN5E1Dv NsDJRB62QALD+Nr+oOxn2AgZ3hBKUPBGPnCqnYyRTCIG8Vl8I2g= =1xjU -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 17:44:38 2019 Received: (at 35282) by debbugs.gnu.org; 15 Apr 2019 21:44:38 +0000 Received: from localhost ([127.0.0.1]:35679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG9P4-0005fB-4a for submit@debbugs.gnu.org; Mon, 15 Apr 2019 17:44:38 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:52996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG9P1-0005f2-SY for 35282@debbugs.gnu.org; Mon, 15 Apr 2019 17:44:36 -0400 Received: from localhost (188-22-89-123.adsl.highway.telekom.at [188.22.89.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id DEA103360172; Mon, 15 Apr 2019 23:44:33 +0200 (CEST) Date: Mon, 15 Apr 2019 23:44:22 +0200 From: Danny Milosavljevic To: Maxim Cournoyer Subject: Re: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. Message-ID: <20190415234422.107492cb@scratchpost.org> In-Reply-To: <87bm17m37j.fsf_-_@gmail.com> References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> <87bm17m37j.fsf_-_@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/LVYtSHd7abgRG/63q6dEqfp"; protocol="application/pgp-signature" X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: LGTM! Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [85.13.145.193 listed in list.dnswl.org] 2.3 BODY_SINGLE_WORD Message body is only one word (no spaces) X-Debbugs-Envelope-To: 35282 Cc: 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.6 (/) --Sig_/LVYtSHd7abgRG/63q6dEqfp Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable LGTM! --Sig_/LVYtSHd7abgRG/63q6dEqfp Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAly0+zYACgkQ5xo1VCww uqW0vAf/Q67a8GjW10mIsz2l0xjVF6iSqo5JLw1gVsdXd6OW6i0rkZmXZH1fe+By sh0UcEHz5qr2YJNOpEjIzq8cq/+h5ClpmsSXcLqrhJw4mEW5FvkpmucO+gLNbbRQ YgBZrIivkLqlcOm97zDnZ9EapSC2obyF8HNq/JJIteVv5gcUNQ93AZB6a7y+w+s9 SNGJfBkowys64X62UUQy/kFvbJKUnoFWnq7BJ96y+WxT5aJLa2Wb3YWWPStwH68a TJfVchGpKjr+umXMq6c30QrJf84D7pOtANpLGmL2CVsFsqchz61XA4BaQhsFp955 P2s95S/Thd+W2J2XjO5QBNN0UxN+Vw== =LmaO -----END PGP SIGNATURE----- --Sig_/LVYtSHd7abgRG/63q6dEqfp-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 16 10:55:10 2019 Received: (at 35282) by debbugs.gnu.org; 16 Apr 2019 14:55:10 +0000 Received: from localhost ([127.0.0.1]:37696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGPUL-00026z-Uz for submit@debbugs.gnu.org; Tue, 16 Apr 2019 10:55:10 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:46236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGPUK-00026f-N2 for 35282@debbugs.gnu.org; Tue, 16 Apr 2019 10:55:09 -0400 Received: by mail-qt1-f181.google.com with SMTP id z17so23537128qts.13 for <35282@debbugs.gnu.org>; Tue, 16 Apr 2019 07:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ZCJXHaJ7MS9DBnXU0IHvtaJUXdDw2XShIR+k3E8xSaA=; b=sNTXJJ4lKwWMPm5uLeuQ3DY87hkihhES8xb9nWevc8MjMh0P8XTGUV0vZSoyP/XHMN yRwSbGSOq+ivFZ8ELVKOysNTwElhArQaP2jEW5Q4FfSABXHEnXBIxZs3KdPqPqFXOFZi fBFJaysIJafRIF8okxaBh1JAAvYXG1MBOoZN8ZOfHwCH2+Jep6tXLbZRvnNdeZsL9qsF zC2/nqjjkiduCkk7JpN7y6YLOa9n/+U/VFJIJaVrByaVqKICh4Ojr0J7hb3aSx+zDOla 4T2vasMlNEbECGHoU0eOl9j1BZew/QwMXPCp0gNyMHGU6Z+oqWIuLdD7n2taE9dpQryS dkFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ZCJXHaJ7MS9DBnXU0IHvtaJUXdDw2XShIR+k3E8xSaA=; b=XbkrDAooj8Xy9IKp5Hvs8/aE0ixnhl3IZVyipzvPca2LQENZSMBZti5NMhbB0WrBUN ZyA3Bev8EFnpR8wBdBfIazqsRAzeCMZgipPPcv98op1ZRfP2Vs6dvZaCWOuZDrZT2q0W M4VnL4lkR9ACnvDzkecjptgn2XH3iNV9cWq/6og2wln1yNQfT47AZ94soDzJN02m7kyU IEUoQtadwwesjl8K8SvUVTvQ5CoQF4G5x8nxRTO1fmR0hQeZjGJ2MlQbwJIs/U+ilhwe pnJA/LwD66jrIYNw7bwm8pIL0OTPY4gir7e8jmdG6iCbZxcApbwdCQ2cU7SLPTJa+fIp Lymw== X-Gm-Message-State: APjAAAUHBQ1OYYhJ6b8oXWOpSp6sG8S62mbYeQfWZb/ANUSVJgolodg9 DGKteb52eyeX5TNk6TmnSPYociED X-Google-Smtp-Source: APXvYqy0VxENytMEyXVkhFajUSAc2HIPDKhMW8zZh6sLfRngtEEBFSp4mo+H8gClBbVrWBrnv+gIMg== X-Received: by 2002:a0c:8af7:: with SMTP id 52mr66694622qvw.169.1555426501947; Tue, 16 Apr 2019 07:55:01 -0700 (PDT) Received: from kwak (dsl-158-139.b2b2c.ca. [66.158.158.139]) by smtp.gmail.com with ESMTPSA id h13sm17872586qkj.96.2019.04.16.07.55.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 07:55:01 -0700 (PDT) From: Maxim Cournoyer To: Danny Milosavljevic Subject: Re: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> <87bm17m37j.fsf_-_@gmail.com> <20190415234422.107492cb@scratchpost.org> Date: Tue, 16 Apr 2019 10:54:59 -0400 In-Reply-To: <20190415234422.107492cb@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 23:44:22 +0200") Message-ID: <8736mim24c.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35282 Cc: 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Danny Milosavljevic writes: > LGTM! Thanks for the review, Danny! These changes are blocked by #35263, which modifies the go-build-system slightly, so I will wait for that one to be reviewed and merged first before closing this one. Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun May 05 21:43:30 2019 Received: (at 35282) by debbugs.gnu.org; 6 May 2019 01:43:30 +0000 Received: from localhost ([127.0.0.1]:55328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNSfC-0002xl-0G for submit@debbugs.gnu.org; Sun, 05 May 2019 21:43:30 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:41496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNSf9-0002xT-27 for 35282@debbugs.gnu.org; Sun, 05 May 2019 21:43:28 -0400 Received: by mail-qt1-f174.google.com with SMTP id c13so13036410qtn.8 for <35282@debbugs.gnu.org>; Sun, 05 May 2019 18:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=0DRw4uTVWSDtJIDDFJE2ocLKDycMzkb0WQpeZWT0Ifc=; b=obESO9aye3k2yc2UCwVmVo9PYoFxoptlgsQSiepemWEVAG/yI8nJ8gMO+Yk+My3Ge5 MHx8VzNCxtKrYX23tJVfSD2mmUi4bPeTH1noj95+0y+IinCDIL0r1k+UVzo5G5nqVvxE jRC+muwV+biWcOsemDR6qVI17Q5MLqkhY84Mnws0ZNPhzPnk21xKLbZ9aHdpMjNfX0pc r6DcEV0/ipeOogtkPE3uFOfIl+Sn6yD2Hzndxy6/Txigdscy5xVfDbGaBvF5lq6uz8Rx sIs5TmIp3Nau5CmqMOXQ1xZt/ZDRSvOvGrgngOZxdKG9CLLH/KCrlQ2XwMQQ43Y8w7FL jtZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=0DRw4uTVWSDtJIDDFJE2ocLKDycMzkb0WQpeZWT0Ifc=; b=h1CMJzq3aon5BabxKry3yV7vZhwE+Ir1FirrtV13Upsy5DG+I+TerWbeJ2N8RgI0Mh 6K9BNQQ+rj7IjavBCWdmj0BHGdvskJ3LBlTJtCaRS+WspuNM5o/oFc/aHzm1cwsdKyuN 36X2G++THXp7MICtEx4npJbzunwWPqPS3XcqQ3/fZn5X/DE26oGotE2IWOa/UdNbPOa0 WZKMdMrZw0twdfI9UFrlRy8rkSzsZd/g41yAXGGxwi74zAL017Jxs/glgYZhjrSX5Ntm XfQjr1KAZL4efBL/ZzbhVF2WWHLhaisg8TLeVPxLkMDNXBrI8Z13zU7SRU1coEb4LK6Z D7Sg== X-Gm-Message-State: APjAAAXkrkmG+nHiXj74GjGNkiFe/DWRa6CJpwy6BsmkAjkQBu4liJil tE2vGdX3RZoFh/OzNv2X2YUZDOSIemI= X-Google-Smtp-Source: APXvYqzwLy94NgktglXY9f+Ns7lAMChSYphPnsC+cqahNhLp9o0xN/q69j7JO7dfYgGK7Qau/PX43w== X-Received: by 2002:aed:2307:: with SMTP id h7mr19213394qtc.87.1557107001314; Sun, 05 May 2019 18:43:21 -0700 (PDT) Received: from kwak (dsl-205-236-230-39.b2b2c.ca. [205.236.230.39]) by smtp.gmail.com with ESMTPSA id g50sm5628032qtg.83.2019.05.05.18.43.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 May 2019 18:43:20 -0700 (PDT) From: T460s laptop X-Google-Original-From: T460s laptop To: Maxim Cournoyer Subject: Re: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> <87bm17m37j.fsf_-_@gmail.com> <20190415234422.107492cb@scratchpost.org> <8736mim24c.fsf@gmail.com> Date: Sun, 05 May 2019 21:43:18 -0400 In-Reply-To: <8736mim24c.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 16 Apr 2019 10:54:59 -0400") Message-ID: <87r29ccq89.fsf@kwak.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 35282 Cc: Danny Milosavljevic , 35282@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Maxim Cournoyer writes: > Danny Milosavljevic writes: > >> LGTM! > > Thanks for the review, Danny! > > These changes are blocked by #35263, which modifies the go-build-system > slightly, so I will wait for that one to be reviewed and merged first > before closing this one. > > Maxim Push as commit 59781b32d8. Thanks! Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon May 06 10:49:06 2019 Received: (at 35282-done) by debbugs.gnu.org; 6 May 2019 14:49:06 +0000 Received: from localhost ([127.0.0.1]:57182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNevS-0000Sn-I3 for submit@debbugs.gnu.org; Mon, 06 May 2019 10:49:06 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNevK-0000SF-25 for 35282-done@debbugs.gnu.org; Mon, 06 May 2019 10:49:02 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1557154111; cv=none; d=zoho.com; s=zohoarc; b=eW3MnVesLibw6W6a8Ul12AtyfVI6iQ69hVKVM5+uyCIUE29g9/rmEFw8jro5dBO/TYculrT6ZwWCJve+5lWZsd43ITtSML8n2nG49JHqTydfDQL3c0dpA8Lh+rgThwL9LHAjjOAHmdSkoIkzo/njw9UckIgGpQB+VnoTCiPsa80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557154111; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=aepH4V3vduS8yV26sggR8vz8xl+xfvbjyGS7P3NT1GE=; b=K/T2Oo65ymww2co0E/mvtwA74z2FLvwYr7wV0skhYs9Onxn76gZ46qw2TEvGkFJzYhwY8iUQll6bAcdkd5GivrXXp36GhWA5UMR/tArSRJ3Uu29B0aq4OZP05GGGcYDBS3/gb2yb7bie0WHjO4EkvioJTLhyg/UiOuwJdDVq5L4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1557154111; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; l=499; bh=aepH4V3vduS8yV26sggR8vz8xl+xfvbjyGS7P3NT1GE=; b=Cys9LKefV6/pW55UvfK5oRjWsH88AksA++5Xxz+uKzFGQh53jk7yk5FiiyISkZrg FcK6GBj6EiwDMuM5LvQExdkn5ZoxlaxuOIglXUJhZErqttBNlkaoZ5FMddmZYBJqR9+ 5UwXDpqAPPtm9PCGpvMbmKPibF52s9UUD2Cag0tM= Received: from localhost (141.80.245.207 [141.80.245.207]) by mx.zohomail.com with SMTPS id 1557154109760662.5088368593583; Mon, 6 May 2019 07:48:29 -0700 (PDT) References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> <87bm17m37j.fsf_-_@gmail.com> <20190415234422.107492cb@scratchpost.org> <8736mim24c.fsf@gmail.com> <87r29ccq89.fsf@kwak.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.2.0; emacs 26.2 From: Ricardo Wurmus To: 35282-done@debbugs.gnu.org Subject: Re: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. In-reply-to: <87r29ccq89.fsf@kwak.i-did-not-set--mail-host-address--so-tickle-me> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Mon, 06 May 2019 16:48:26 +0200 Message-ID: <87lfzjfxl1.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35282-done Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) T460s laptop writes: > Maxim Cournoyer writes: > >> Danny Milosavljevic writes: >> >>> LGTM! >> >> Thanks for the review, Danny! >> >> These changes are blocked by #35263, which modifies the go-build-system >> slightly, so I will wait for that one to be reviewed and merged first >> before closing this one. >> >> Maxim > > Push as commit 59781b32d8. I=E2=80=99m closing this. --=20 Ricardo From unknown Tue Aug 19 21:02:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 04 Jun 2019 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator