From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id KJ59B2VNPWbJMgAAe85BDQ:P1 (envelope-from ) for ; Fri, 10 May 2024 00:25:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id KJ59B2VNPWbJMgAAe85BDQ (envelope-from ) for ; Fri, 10 May 2024 00:25:41 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=jzJkcUhx; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b="cdP1a5h/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715293541; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/D8SdwBq02XptK9KLx0HWDO1qrVWxgIMQrmsP9/lSM4=; b=VNqublbont64Wg8GyLgTCI/56w3qD4+jK8hT1Rz/p/Av31SDKs7fssAHB6l0mzM9V76gOG Y2Iru15Mrw928uvp9gCzNHItwG8nv4eJg0OSZe3fPfaxnMSN8sZbx9SvmI5ua3DFjmnMT8 B+4NGyOuDHIz5OnRJxLD+oxN6O+mdJ511sdFIjXHjXeirgxURrTpJQk5pr4NIEG6v2V4SY jS/QC59qRttk2qt/tFbsf/zZtbW+VMAg5OXHsr+Tkckz8wJJe4XpcKWiO8I5vUM+Ugj1dw Sep+s4AscU4JtjTT0mpMqnEyzMyf5+LEshI92ZLs2ygH7gODZA5iApUtPZ2/7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=jzJkcUhx; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b="cdP1a5h/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715293541; a=rsa-sha256; cv=none; b=Rfwe+jMkuyz/RG4+rS+Xob0iCYmFGQ3k2GCDOkMXuBTvHiyCafhlqjkxR60JnHTlHs3WxE Gbih8IHz9Pwku0nJC7shhLxBeJLnzc+tKP2dkLro/du91QPpfZeTcQDefMWWScmup0jFKz IIag37yj3VvbxIaYf10G51Kmt1RGkvB8vBDcbSgeZE8ikJJICoKyZPeNRdqwVzfooW9piv CyrsCPC2r61RfflkcgWHsFh2oDgOD4DraOT48LzgVU2Q6+CXbYmgPJc4E9tR9QlY0mFOAR VtHy+yuHbsk7wfCZs/M8uQ+enmYjQmmVuH43yNfFrLG76zomYH6ocHYVZTjWcg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DFEC369744 for ; Fri, 10 May 2024 00:25:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5CCM-0002re-Vw; Thu, 09 May 2024 18:25:11 -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 1s5CCL-0002qg-0d for guix-patches@gnu.org; Thu, 09 May 2024 18:25:09 -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 1s5CCK-0006q3-Np for guix-patches@gnu.org; Thu, 09 May 2024 18:25:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5CCJ-0002At-1g for guix-patches@gnu.org; Thu, 09 May 2024 18:25:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH v2 11/11] gnu: buildah: Switch to gnu-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:25:07 +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.17152934568265 (code B ref 70112); Thu, 09 May 2024 22:25:07 +0000 Received: (at 70112) by debbugs.gnu.org; 9 May 2024 22:24:16 +0000 Received: from localhost ([127.0.0.1]:40962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5CBT-00029A-LL for submit@debbugs.gnu.org; Thu, 09 May 2024 18:24:16 -0400 Received: from wolfsden.cz ([37.205.8.62]:47528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5CBN-00028P-4E for 70112@debbugs.gnu.org; Thu, 09 May 2024 18:24:09 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 253BA2840BA; Thu, 9 May 2024 22:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293450; bh=7lRJgKWvceax2Oa6N87wZkbB3optIHMtQP20NXKaxV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jzJkcUhx8keLq175ANYxSOLPoHvLEyRRCj/sipa8crX5LMECoCaMZmmgFfwlN304c SFrCq1M1Nn6xQGvncqqQx5sJRTQi/eShzRpIKU8xa1jxJrHAIgonVMxaIr7omkc0vh o9SLBGLvdl+9CC5e9fMF0mKAPUBe+gLgNuFXTfohicdr95L2rJTKoXDMhJIys/UoED 0j1xYw9lcaxfyrZnwj+xDOxYx1VC6tvaP9B2wqjihhnJEeF+woy1dFmqqZbzX0pfO8 Zkp4VGBuq3aNcX3i8gwx//L/rbrjaH/ffTUuX271iqjNKilIZlrAmUk8KV0yruvzzI TnBRBNJ5YD7OSOaTzFrl1onyCL/oH8/ydg0g4NcGTlVEP1RchwOXjpSPEOLdHNkyEr uFu/WUuvrpnpfGVH1NXvaX8onC9JyAwY4cMMmLphsWAz8Yw8C9UBjK7FnFa6JeiPXt xDHeLkUcTnuY6pCB0hEXPKy9irb6xaSVULZmg9LSY5y2WbEyHICCxEpmzxhONw/TVr ZGVEC8MIRr34l3jEWB80idm4X7/9M+RpTpDRia8i02rmiGpTbp6e9a3ruC7xQrKxiv qOc3WsT6a/uZUObkqMYISNmfz4b85xqaJ/JL91AR3gT1vdF8O4eChqubhGCNMHmzJb O7k7v1NYiEp5aoo9BgAtbDv8= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 8283F283F6E; Thu, 9 May 2024 22:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715293449; bh=7lRJgKWvceax2Oa6N87wZkbB3optIHMtQP20NXKaxV4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cdP1a5h/vMwKKm996kdTms8xIeRDw3zeSfHNxaBQGy9bhYx3qbrKP+DDvc6gxBI6K DfcFPATOzG5WlwO6T0ErYYydkNt3VoMMwTeP2QsXVG17yM2XapNGZGkDPhfm3J08ke PdNBzzicbj2gbFamLIVDowy56KN61IzK5fFsklTdMraZhu6xyehX01CKdcI6niyFAT f7LLPELRnkB291lw57QB04+h0ti36kQK2CCVcNdcwAByaka5hhMyzdd88qywEVXOCS yedcMDNtW6jNiGHsP9aQMPN4noXO9C+NjNhaZorEm+JLSwGTC+4Ui1QpYxl06fobYh B5iRXvI0c9TUgMCehMAQ1/pT9SZwBiCOVH63Gujk/Fmm2WzfRyEj1BwdfNiuBhKnaP oaefFYwSTsdSFAh9V9r1BgKTckmsh6R8uGubltQf6y4SeH6G7eUt4w52sqKwZIvMEA bjT5gTfOfHW5kg31IP2EAnQ/sPdQ+HmuidYr6KWH0f+icjoFuVQ6MjXiJDBQQn6vrZ YzGzj/a/YujwePlR1oASfyJsUnOpJ51IxElcQSjVhCYDibaISuO0uMBYuLSyodXhrK qo4FwU6QeVGaisBNZJcdw3zD7u57EprK/LKu4LaMorqC9zoxgqKP+EfEtWu4yY609J Ka0I9zsTOQAnRN6fC144p91A= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 10 May 2024 00:23:14 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> References: <4554ead7e7440610c700ba6d5403489f95cfdf80.1715293394.git.~@wolfsden.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 4.11 X-Spam-Score: 4.11 X-Migadu-Queue-Id: DFEC369744 X-Migadu-Scanner: mx13.migadu.com X-TUID: h15dfycyHpXl Buildah is fundamentally similar to podman and provides its own Makefile. This commit switches from go-build-system to gnu-build-system so that the build can be done using `make' instead of reinvention some parts (like documentation) in the guile. The package pretty much follows how podman package looks like. * gnu/packages/containers.scm (buildah)[source]: Reformat. [build-system]: Use gnu-build-system. [arguments]<#:import-path, #:unpack-path, #:go, #:install-source?>: Delete. <#:make-flags>: Set make flags. <#:test-target>: Set, even though the tests are disabled. <#:imported-modules>: Also import (guix build go-build-system) for the remove-go-references phase. <#:phases>{'prepare-install-docs, 'build-docs, 'install-docs}: Delete. {'configure}: Delete. {'set-env, 'check, 'symlink-helpers, 'wrap-buildah, 'remove-go-references} {'install-completions}: New phases. [inputs]: Remove no longer used cni-plugins, conmon, runc. Add bash-minimal. [native-inputs]: Remove gnu-make, add go-1.21 and bats. Change-Id: I0ddd5febb0116a71a857e2a98a9951dbe8bd40d9 --- gnu/packages/containers.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 494777cd28..286dc0491e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -611,50 +611,75 @@ (define-public buildah (base32 "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) (file-name (git-file-name name version)))) - (build-system go-build-system) + (build-system gnu-build-system) (arguments - (list #:import-path "github.com/containers/buildah/cmd/buildah" - #:unpack-path "github.com/containers/buildah" - - ;; Some dependencies require go-1.18 to build. - #:go go-1.18 - - #:tests? #f - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("../tests/tools/build/go-md2man") - (which "go-md2man"))) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("/usr/local") (string-append #$output))))) - (add-after 'build 'build-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc)))) - (add-after 'install 'install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc "install"))))))) - (inputs (list btrfs-progs - cni-plugins - conmon + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "GOMD2MAN=" + #$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) + (add-after 'unpack 'set-env + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; 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)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test-unit") + (invoke "make" "test-conformance") + (invoke "make" "test-integration")))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-buildah phase. + `((#$aardvark-dns . "aardvark-dns") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-buildah + (lambda _ + (wrap-program (string-append #$output "/bin/buildah") + `("CONTAINERS_HELPER_BINARY_DIR" = + (,(string-append #$output "/_guix"))) + `("PATH" suffix + (,(string-append #$crun "/bin") + ,(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" + (string-append "PREFIX=" #$output))))))) + (inputs (list bash-minimal + btrfs-progs eudev glib gpgme libassuan libseccomp - lvm2 - runc)) + lvm2)) (native-inputs - (list go-github-com-go-md2man - gnu-make + (list bats + go-1.21 + go-github-com-go-md2man pkg-config)) (synopsis "Build @acronym{OCI, Open Container Initiative} images") (description -- 2.41.0