From patchwork Wed Jul 3 16:36:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 28933 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 4DEAF27BBE9; Wed, 3 Jul 2024 17:38:50 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 B021327BBE2 for ; Wed, 3 Jul 2024 17:38:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0004op-IM; Wed, 03 Jul 2024 12:38:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP2zY-0004oQ-Kb for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP2zY-0005KZ-C1 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2za-0006YI-5G for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 16:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71923@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71923-submit@debbugs.gnu.org id=B71923.172002467125129 (code B ref 71923); Wed, 03 Jul 2024 16:38:02 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:51 +0000 Received: from localhost ([127.0.0.1]:40264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zO-0006XD-Vb for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:51 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:61764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zN-0006X1-4i for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:49 -0400 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-367339bd00aso4387763f8f.3 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024606; x=1720629406; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V47GnwLNN7skzZt7h9k9wMvT0ZY6EEjGwQN3y7TR2bQ=; b=EHMT93WDzJyfv2MNuCqFXekRu6zNhpuOPjh/3Okxf2V8ipQ9oSJp3PbWGynxXV1O4b eooWbyQ9v8oTivQFPgy+31PLPET/4tg7jG3diVcESXProDj4PjULesrSlLwMcAYwtLsv ZmHnkq+53Bq6ame881gzLDDiJ6KzpFPUgAZ1Vd3SQxLCHO2Ub0PstFIDvvumxd/W+9Rd BRNOwP/hQYDHNYHSlOgPPk1P9m3zIxnNx6KjYjjFVGrqyMwsPQ4GPbPjYgI1tCpCYlJr huBWb5IchP4JXBQx/P3sLXM+ETe4n/EOzO+1eO4MndsA9EVEkhRFfmr75tvnhF4L/rMR kZNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024606; x=1720629406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V47GnwLNN7skzZt7h9k9wMvT0ZY6EEjGwQN3y7TR2bQ=; b=hlSFOKjoHwmDnvvYpEp/P/hsix5Ix2j4qOmGEQnin9Q3GiSjawcnLGnmnsmJzKtvuh Z8GV562OYhh+CMOiB+jsPFo6+chTcFv77O0KlnyGreJmLl6yTAMcfbM37XHzAksbZZMd GSW/Kn+0bL+cxRbYEvXePj4X9dToPMx3Dbi0E+GArhXUR/3VQtJMqvmPhS0bvJR37GeA pKhDZVz305X6tHSAnQOy2h8cKFYpiM59E5fOVPTa54VoctDG6zClIe5pz6dCRo0fUDD6 RSNx+QzsWtYs5HXgXEubgVCmgc0XwAoAZAtWEQe+9ZehTvcVDsJ8ptecsWr6rQC/RilA dbXQ== X-Gm-Message-State: AOJu0Yw2XSyqSqRNkdtZYsN7FudIuldml6jqniCUSlBN5CfzFD6yw3QP eGCOFhid86YPSozHOorcXCGJLu4ESHA9t5P7FMah+39LP+fvpjj3FVU8/k5SOpWfMbgh8bYdpuC q X-Google-Smtp-Source: AGHT+IEOmT1QZqErMPuEvTCMYX9gI8idZxTiuc1ooD/Pf17yxRaGfLWc/SV6RziHvE3OW5ic0QdMTA== X-Received: by 2002:a5d:5301:0:b0:367:40e6:46bd with SMTP id ffacd0b85a97d-3677572985bmr7068372f8f.61.1720024605963; Wed, 03 Jul 2024 09:36:45 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367956ca37asm1760356f8f.75.2024.07.03.09.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:45 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:40 +0200 Message-ID: <49da27736e5834aa9444c8bf7b9fa727f938b521.1720024272.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (gvisor-tap-vsock): Remove 'remove-go-references phase, add 'patch-go-reference phase and remove imported modules. Change-Id: I202292e303268b3ec0f13f19d4ceba517cd73aaa --- gnu/packages/containers.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index c57f249ebd..396324284e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -392,12 +392,15 @@ (define-public gvisor-tap-vsock (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) + ;; Add -trimpath flag to avoid keeping references to go package + ;; in the store. + (add-after 'unpack 'patch-go-reference + (lambda _ + (substitute* "Makefile" + (("go build") "go build -trimpath")))) (add-before 'build 'setenv (lambda _ ;; For golang toolchain. @@ -408,9 +411,7 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin")))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references))))) + (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") From patchwork Wed Jul 3 16:36:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 28932 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 8F8AC27BBE9; Wed, 3 Jul 2024 17:38:41 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 15F3E27BBE2 for ; Wed, 3 Jul 2024 17:38:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2za-0004pG-JU; Wed, 03 Jul 2024 12:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0004od-37 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP2zY-0005Kh-Qr for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2za-0006YR-KQ for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 2/4] gnu: podman: Fix build. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 16:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71923@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71923-submit@debbugs.gnu.org id=B71923.172002467625153 (code B ref 71923); Wed, 03 Jul 2024 16:38:02 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:56 +0000 Received: from localhost ([127.0.0.1]:40268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zU-0006XY-CP for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:56 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:46424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zS-0006X2-W3 for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:55 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-36789d19ffbso891404f8f.1 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024607; x=1720629407; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EnykTgSuz/BLYADj7iY4JEcaTQfRC2HaPZ8PpBPkKwk=; b=NGHc7UPLofGlSc52n082kL5D5dtagRGoau9yUgPRiaIZ0+vvWWfqI+oF7eRkUgM8Vq Ick8Zuffg7USw4FuBx+3DsUwVuZQ1qmrOiLA/YnWX4TbZgfiipGETLlJOT5ffJpqltn8 m0MgOFmwJIoDzC8q+VvhcB/2hrMpAu6h24upX7TEm9HkIKzHZTBXAEZtKxXGNyvEP5Dy 6BgKD1g/BoZ4OeK+sHYCfw3pihgZlzuAOoEss8YN+Os9PuSvxRehczpyoQEN/Ojj/raz 8kAaNLR8WBXXuTemBR3fNKOnLwHpssHg++QIuaIdDhtRqAdQZ7or0IsZjgNDYgLkyFtL htxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024607; x=1720629407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EnykTgSuz/BLYADj7iY4JEcaTQfRC2HaPZ8PpBPkKwk=; b=Q1lA0fW/2BJh3l1nz+G+FkXoiY+z/D6jGq7NFyTrp1V3pFYJEv5Q7WzcSbYhJYjeLJ OB7N+4YyTK6Y6Y5hH1JRMp5mFRgC/IgR4FzmJbI4vG3+d8T4b8YyaI6cWA1yFprwwfon lCojwmNq9qjEVgfpT+RoDYjkZMAlIUvtecFxkV7ch5q9NNDW99KYYBIH2A9jDORBMg6Q TanYT7Zv4/tbrRlAe1pYXdd5skrrVTSpBUeEMAAP6XRQW0IOVjUK75STuwHbHTiKpBdX 6ehTRtuW3vCW59IO03SoLuo9aeojdjTZA+Qc8LTOIFwrW42xEWF755UN5CrVdK6j6Gws ZZaw== X-Gm-Message-State: AOJu0YyD7eXZlPgXWc7yVmQRdSZoSdQ1jWHYgLv0/5mudHe8ba3ahRwA 0IDkRYOrwEkfuutC8c8DyKpXobrgyJ46YT8CMb6g1iQ6ggtF+mZuapndcxhhPuE2vS0Iz8pbmhc Y X-Google-Smtp-Source: AGHT+IGoa29ReLGU7uxTsMUQJ0ky2didxzk20cCDDQqhGS/Ywgl1ClSePV3WYgMEjv63FEvPDYqUEw== X-Received: by 2002:a5d:6b11:0:b0:35f:1835:3a76 with SMTP id ffacd0b85a97d-3677572968amr8499074f8f.70.1720024607207; Wed, 03 Jul 2024 09:36:47 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367956ca37asm1760356f8f.75.2024.07.03.09.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:46 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:41 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman): Remove 'remove-go-references phase, add BUILDFLAGS=-trimpath to make-flags and remove imported modules. Change-Id: I6ffca5bd5be21b8b61ea9aa50273f97c5e342f9d --- gnu/packages/containers.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 396324284e..38af5cb3fb 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -473,12 +473,10 @@ (define-public podman (string-append "PREFIX=" #$output) (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") (string-append "GOMD2MAN=" - #$go-github-com-go-md2man "/bin/go-md2man")) + #$go-github-com-go-md2man "/bin/go-md2man") + (string-append "BUILDFLAGS=-trimpath")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -530,17 +528,6 @@ (define-public podman ,(string-append #$passt "/bin") ,(string-append #$procps "/bin") ; ps "/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (lambda* (#:key inputs #:allow-other-keys) - (let ((go (assoc-ref inputs "go"))) - (for-each - (lambda (file) - (when (executable-file? file) - ((@@ (guix build go-build-system) remove-store-reference) - file go))) - (append (find-files (string-append #$output "/bin")) - (find-files (string-append #$output "/libexec")) - (find-files (string-append #$output "/lib"))))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" From patchwork Wed Jul 3 16:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 28931 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 6F3D027BBE9; Wed, 3 Jul 2024 17:38:36 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 B8D8027BBE2 for ; Wed, 3 Jul 2024 17:38:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2zb-0004pw-To; Wed, 03 Jul 2024 12:38:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0004oq-K6 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0005Kp-Al for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2zb-0006YY-33 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 3/4] gnu: buildah: Fix build. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 16:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71923@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71923-submit@debbugs.gnu.org id=B71923.172002467925170 (code B ref 71923); Wed, 03 Jul 2024 16:38:03 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:59 +0000 Received: from localhost ([127.0.0.1]:40271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zW-0006Xs-RL for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:59 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:48130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zT-0006XB-Ul for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:56 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-367601ca463so3175422f8f.0 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024608; x=1720629408; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ym5k5K/rSjvaEsGdSOC6J5L9do04yhB//geYWjvuvzI=; b=gG5NU8azX97aw0+xLiPaL5jsUbx2v+RBMt557XZ31xz6i27PJ6zPHvLtid1vB7PaKD MwJ2B4uIT7W6SkcqWWPhtvxISzxEziRArxVoBTUSDsV3a24JzmBfbusxVw2Q7LGu0PvI VRHNjDwpTu/ooge2f9MP7nKq12xO3KKD6NnEUdP7BwKwAHBzuPs+50eDF+QCua4W9uQP 6hmFJg8w/uTggCyA0sxSc/LgGspw2sCDXPyOz6gLKbZ0w2tJPYm64k1UbHY4tJ6GOhSu K78BgXkhGqfFMa31zjWkae8xtzXuFL9kbKy6a+YsQNHqGaHcV5F8I7qERJmD4iVn2cKN qfNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024608; x=1720629408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ym5k5K/rSjvaEsGdSOC6J5L9do04yhB//geYWjvuvzI=; b=mZqppv7eab2ER5baO0Gqhs5UcSqW7jRdVn2dd/bdXYrpPT1MK3nY4PG3o3PyYfxKuN KpLdR5nwJprT5LFMON9PEzuDaaRZLFRIEKZOYc8k1wGpKeizcd6PAzlyzBkgwrO5L8oN UYh+dBxaKHKjhDOdsKoXeIcMMKv814uUb+XiLu9IZ6SAwDle9Vwc5RQdo2ulFRpleG7H /h6CLY3QveGKhxKcPigoAj4l1AkBZjXQsHV65KXGyKZSq7nQO/T2e5XyRgQBOfOFrW9+ 24cyKfXOp/8vYgENSDdf+iVO37Koa1R5wmuRGaqjcwJy8Br8J5i51F5xeSX7Mnhjz0iX iJEQ== X-Gm-Message-State: AOJu0YzOJR46AlkQhNsr7NLOvmpHb0VwWRU29CoSISal+IbdLyjr8g0M /m2s3JA2kYVfAFeFkj/qGfM7L3Aai8LedOLJ5ZAC3QDcOCzmOV806DQybF4lW/qEOHY+PBIx0wN w X-Google-Smtp-Source: AGHT+IHrjp3WI9yOM1qwmXefx47UjORhCXMtkmPDtJoZJJoEyBNDYEqn96g7tj1wtmoeMF55IpmcSw== X-Received: by 2002:a05:6000:154f:b0:366:ec2f:dbd3 with SMTP id ffacd0b85a97d-3677571b658mr11392277f8f.47.1720024608301; Wed, 03 Jul 2024 09:36:48 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367956ca37asm1760356f8f.75.2024.07.03.09.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:48 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:42 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (buildah): Remove 'remove-go-references phase, add 'patch-buildflags phase and remove imported modules. Change-Id: Id89ea5c90ba8064484eec460efdfa592c974adca --- gnu/packages/containers.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 38af5cb3fb..1b7032ca82 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -617,9 +617,6 @@ (define-public buildah #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test-unit" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -631,6 +628,12 @@ (define-public buildah ;; Make <4.4 causing CC not to be propagated into $(shell ...) ;; calls. Can be removed once we update to >4.3. (setenv "CC" #$(cc-for-target)))) + ;; Add -trimpath to build flags to avoid keeping references to go + ;; packages. + (add-after 'set-env 'patch-buildflags + (lambda _ + (substitute* "Makefile" + (("BUILDFLAGS :=") "BUILDFLAGS := -trimpath ")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -658,8 +661,6 @@ (define-public buildah ,(string-append #$gcc "/bin") ; cpp ,(string-append #$passt "/bin") "/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references)) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" From patchwork Wed Jul 3 16:36:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 28930 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 9734C27BBEA; Wed, 3 Jul 2024 17:38:29 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 24D2627BBE2 for ; Wed, 3 Jul 2024 17:38:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2za-0004pY-WC; Wed, 03 Jul 2024 12:38:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP2za-0004p3-3b for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0005Mi-QJ for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2zb-0006Yg-JG for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 4/4] gnu: podman: Update to 5.1.1. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 16:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71923@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71923-submit@debbugs.gnu.org id=B71923.172002467925176 (code B ref 71923); Wed, 03 Jul 2024 16:38:03 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:59 +0000 Received: from localhost ([127.0.0.1]:40273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zX-0006Xv-5L for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:59 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:48538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zV-0006XM-5j for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:57 -0400 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-36798e62aeeso133976f8f.1 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024609; x=1720629409; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rv3heHkAaWESRFenDh8dSND03obKuOOiS7UU0JjQTao=; b=l5HeleUjyc7cm0qQUqsi/NdIHNhfhOO0kQO0m1ohggfSEzHxxe4ADTxMcy2A6p0ogs px3ijZVRjBYL2/kclmNfuUu4iVfFRukMs5pSyujKZaJUwDCgbyAS8TqmmTaiHJKgaxJh iMlVzhudSUo7DT7BeMoMRfGjoMBRtk91x3xkcdVQaNpG+wYg3NPxDD+xAckxe9DP8yiA kN5iMFxl+t9n4xAcZuJNVWpBNAbhB/+v7mOQoDSr5wZ1yZ1LYcPuJ7hgtlThcqdO+NWQ LEV5+fffRqIT7al4D8x2BeTewJDwJOjLDiTWbavWx31lReMJwF4/ruSa49y8kzVHASKW FMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024609; x=1720629409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rv3heHkAaWESRFenDh8dSND03obKuOOiS7UU0JjQTao=; b=ip/5g0boY9UOaxk0hjAMv1i+yLKqp2TuLJ08wHPUKS79Hc7pijp4KMMBq9f1+uWn9N NUbTinsJ7IjuxN2THEfyrcbpYg6T4WJzR0yHV1OmZ59Yfz3AXG/tYZB8PO5d4mfU9zya gwBJVbpBZoltG4CxAUETcEo873RUu8PnnNK63y/WGz/jVQ2WCRA2OkkS4rfWjuMYAwT3 1Qy3c1Mn1j3w273jR9iY/nRU0g3ZBJYBKf23o1Top5n9icjOWuebCSN4lAZXFLsKRdSb 0EeKDSgu8FUcMsNV1nRluZqTLi2Dmzgp51I3J9O5ffiarvdCWssS/LXkscn4q7LPjyUo HWww== X-Gm-Message-State: AOJu0YyQSGAgsC7tM4vckqEHpnQK3Y4+hcMqUU8g6vhQRy3OCrb9xlwG Z5IkxoEOnloXo/VPE+Fn2c90i2t1hIcYc1bCghIvz4VLU/1CJK5bsQ8r8jieb+w+gtvuoa/TtD1 8 X-Google-Smtp-Source: AGHT+IGbcAaWgpWlqvO5mefnwG/Rbb937ygQD/EoF78uFOdoXsYGQwgIiJKFlcNYi5bAu20QkAFFYg== X-Received: by 2002:a05:6000:146:b0:367:880f:b8b0 with SMTP id ffacd0b85a97d-367880fba65mr3040963f8f.8.1720024609451; Wed, 03 Jul 2024 09:36:49 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367956ca37asm1760356f8f.75.2024.07.03.09.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:49 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:43 +0200 Message-ID: <462d564f81c159a7b720f3db2ff8bf302878fdc5.1720024272.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman): Update to 5.1.1. Change-Id: Ie2563c1862debefcd6b5d0268e6cb57b6ae7193b --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 1b7032ca82..fccb972b94 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -455,7 +455,7 @@ (define-public catatonit (define-public podman (package (name "podman") - (version "5.1.0") + (version "5.1.1") (source (origin (method git-fetch) @@ -463,7 +463,7 @@ (define-public podman (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "0ldzrrz8jba6ka1xfs8msiy08iz4m674xhfxbcdsnc9lmxi3ys4f")) + (base32 "1rhlwd350ll472jn7gm4nbkfkbm609d5s97wdqfb7lfagqwi1vny")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments