From patchwork Sun Mar 31 18:35:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62395 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 2842D27BBEC; Sun, 31 Mar 2024 19:36:52 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,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 28CFE27BBE2 for ; Sun, 31 Mar 2024 19:36:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02Q-0001GA-7M; Sun, 31 Mar 2024 14:36:14 -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 1rr02H-0001Ca-Pz for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -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 1rr02H-00082B-E6 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02K-000213-2L for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 08/11] gnu: gvisor-tap-vsock: Remove references to go. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101547615 (code B ref 70112); Sun, 31 Mar 2024 18:36:08 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:54 +0000 Received: from localhost ([127.0.0.1]:48438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr026-0001yk-5e for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:54 -0400 Received: from wolfsden.cz ([37.205.8.62]:52008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01f-0001we-8J for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:27 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id EF1B929DBFD; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 934812A0154; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:05 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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 This is handled automatically by go-build-system, but (obviously) not by the gnu-build-system, so add the phase manually. * gnu/packages/containers.scm (gvisor-tap-vsock)[arguments]<#:phases>: Add 'remove-go-references phase. Change-Id: I5cef0bc03dfa7f219bdfec4226d0e7772401a5a5 --- gnu/packages/containers.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index faea15b8c4..992ef82d3f 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -26,6 +26,7 @@ (define-module (gnu packages containers) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -387,6 +388,9 @@ (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) @@ -400,7 +404,9 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) + (install-file "bin/gvproxy" (string-append #$output "/bin")))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor")