From unknown Mon Jun 16 20:49:20 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70115 <70115@debbugs.gnu.org> To: bug#70115 <70115@debbugs.gnu.org> Subject: Status: [PATCH] gnu: skopeo: Update to 1.15.0. Reply-To: bug#70115 <70115@debbugs.gnu.org> Date: Tue, 17 Jun 2025 03:49:20 +0000 retitle 70115 [PATCH] gnu: skopeo: Update to 1.15.0. reassign 70115 guix-patches submitter 70115 Tomas Volf <~@wolfsden.cz> severity 70115 normal tag 70115 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 17:07:42 2024 Received: (at submit) by debbugs.gnu.org; 31 Mar 2024 21:07:42 +0000 Received: from localhost ([127.0.0.1]:48695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr2Oz-0004Uy-Kl for submit@debbugs.gnu.org; Sun, 31 Mar 2024 17:07:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr2Ow-0004Uk-Tr for submit@debbugs.gnu.org; Sun, 31 Mar 2024 17:07:39 -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 <~@wolfsden.cz>) id 1rr2Oo-0006Vx-Su for guix-patches@gnu.org; Sun, 31 Mar 2024 17:07:30 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rr2Om-0003Mh-J8 for guix-patches@gnu.org; Sun, 31 Mar 2024 17:07:30 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 821C229F248; Sun, 31 Mar 2024 21:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711919245; bh=mh93fn6G9uAa+Ou7Xg4QItzHDalo/keNcUcYNyT/sBA=; h=From:To:Cc:Subject:Date; b=UHYNW5EH+5mFjfpQ8EvE9ezG7dmYvrVpwVOvLTS5vFeRtHvMKwP04eYXTfjxh5Wio MmKbehuQ3Gu1RhGlTZsVusublRorJ4iEsk7FraVMwYMP4x9OCnDkncRirRSVcbh8OO b6NPgnwFrD4XK4wW/4a4YVf7x3RX6yw5zBuflG4MAAPC7Vs96R3Oxuueg7wpJjRq+6 5X3a05RRrUWG2wjQoCOLwkASIFMlHhRqYKiMbrS6RmpP1xG0ICCrpDwGWEdHpM8/fb rVCXQsKZN6OBHSWV9GqScgSgb9ObPskpY4XuYYyZ6Jf2WrTF1TetYWiqujZ7YCDc24 qBZSdcZv7xBHsHvnRynfNuE5pg7qo3Oegh42vT9e4ARCQ2clkduJYf8K4+nFk0yqC3 W7/M/m5BS7uIJhZhdCsQhO2ZXVC6kYmJrJDbvj20rKBdF5q/pWX/eI8PE55df2ZKMM qo93qa57N7vhMBkgAbLGaOCjJA8pkX854QTz6tvLevu/y7VPakJxp4ObRWZD2TWLa8 JyEoMG/nrm7+wEDQmbx6l3HTdF0tteXk0+Sz6IEUjZzYlYClk9jzuoi+Kh8TVzeiio PU67xv6qHWC7a2C8aaXyb8XMq+ZKu4TnmVTepT6kd83HuEgKrD70j5FNNiIssUXefE lVMCb9ODScgXLOKPGvBr0Yg0= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 0534C2A07B8; Sun, 31 Mar 2024 21:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711919245; bh=mh93fn6G9uAa+Ou7Xg4QItzHDalo/keNcUcYNyT/sBA=; h=From:To:Cc:Subject:Date; b=UHYNW5EH+5mFjfpQ8EvE9ezG7dmYvrVpwVOvLTS5vFeRtHvMKwP04eYXTfjxh5Wio MmKbehuQ3Gu1RhGlTZsVusublRorJ4iEsk7FraVMwYMP4x9OCnDkncRirRSVcbh8OO b6NPgnwFrD4XK4wW/4a4YVf7x3RX6yw5zBuflG4MAAPC7Vs96R3Oxuueg7wpJjRq+6 5X3a05RRrUWG2wjQoCOLwkASIFMlHhRqYKiMbrS6RmpP1xG0ICCrpDwGWEdHpM8/fb rVCXQsKZN6OBHSWV9GqScgSgb9ObPskpY4XuYYyZ6Jf2WrTF1TetYWiqujZ7YCDc24 qBZSdcZv7xBHsHvnRynfNuE5pg7qo3Oegh42vT9e4ARCQ2clkduJYf8K4+nFk0yqC3 W7/M/m5BS7uIJhZhdCsQhO2ZXVC6kYmJrJDbvj20rKBdF5q/pWX/eI8PE55df2ZKMM qo93qa57N7vhMBkgAbLGaOCjJA8pkX854QTz6tvLevu/y7VPakJxp4ObRWZD2TWLa8 JyEoMG/nrm7+wEDQmbx6l3HTdF0tteXk0+Sz6IEUjZzYlYClk9jzuoi+Kh8TVzeiio PU67xv6qHWC7a2C8aaXyb8XMq+ZKu4TnmVTepT6kd83HuEgKrD70j5FNNiIssUXefE lVMCb9ODScgXLOKPGvBr0Yg0= From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH] gnu: skopeo: Update to 1.15.0. Date: Sun, 31 Mar 2024 23:05:02 +0200 Message-ID: <071ced8c13ed07991da93082180cad133fe393aa.1711919102.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Tomas Volf <~@wolfsden.cz> 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.0 (/) The package is also converted to gnu-build-system in order to take advantage of already existing Makefile instead of reinventing (parts) of it in Guile. * gnu/packages/virtualization.scm (skopeo)[version]: Update to 1.15.0. [build-system]: Use gnu-build-system. [native-inputs]: Add go-1.21, sort. [inputs]: Add bash-minimal. [arguments]<#:import-path, #:install-source?>: Delete. <#:make-flags, #:test-target, #:imported-modules>: New arguments. <#:phases>{'configure}: Delete. {'set-env, 'cc-to-gcc, 'wrap-skopeo, 'remove-go-references}: New phases. Change-Id: I1010e1f4fbdc093646c2879bdf30125ab2e88bdd --- This commit updates the skopeo, and also converts it to use gnu-build-system. Both is done in one commit, since 1.15 did not built just by straight-forward update, and due to the intended rewrite the time spent debugging that would be wasted. This (gnu-build-system) matches how podman and buildah are done in #70112 bringing all github.com/containers/* projects on the same model. gnu/packages/virtualization.scm | 80 ++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 26 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 251fe00aa0..60f43c19cf 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -151,6 +151,7 @@ (define-module (gnu packages virtualization) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix modules) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -2257,7 +2258,7 @@ (define-public umoci (define-public skopeo (package (name "skopeo") - (version "1.2.3") + (version "1.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -2266,12 +2267,15 @@ (define-public skopeo (file-name (git-file-name name version)) (sha256 (base32 - "0n22sdif437ddg5ch0ipwim3fg0n6ihc9bfi52qkhy3r1grz04hs")))) - (build-system go-build-system) + "1f9n3ysdmll7vq8dmgpv03m8aqq3w9cfvbmxxpwmnv1nlfc67ihq")))) + (build-system gnu-build-system) (native-inputs - (list pkg-config go-github-com-go-md2man)) + (list go-1.21 + go-github-com-go-md2man + pkg-config)) (inputs - (list btrfs-progs + (list bash-minimal + btrfs-progs eudev libassuan libselinux @@ -2280,27 +2284,51 @@ (define-public skopeo glib gpgme)) (arguments - '(#:import-path "github.com/containers/skopeo" - #:install-source? #f - #:tests? #f ; The tests require Docker - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "bin/skopeo")))) - (add-after 'build 'build-docs - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "docs")))) - (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (let ((out (assoc-ref outputs "out"))) - (install-file "default-policy.json" - (string-append out "/etc/containers")) - (invoke "make" "install-binary" "install-completions" "install-docs" - (string-append "PREFIX=" out))))))))) + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + "PREFIX=" + (string-append "DESTDIR=" #$output) + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) + #:tests? #f ; The tests require Docker + #: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. + ;; + ;; This techically does nothing *now*, but after upstream + ;; issue[1] is solved and 'cc-to-gcc phase is removed, it will + ;; start being required. + ;; 1: https://github.com/containers/skopeo/issues/2278 + (setenv "CC" #$(cc-for-target)))) + (add-after 'unpack 'cc-to-gcc + (lambda _ + (for-each (lambda (file) + (substitute* file + (("^cc -" all) + (string-append "g" all)))) + '("hack/btrfs_tag.sh" + "hack/btrfs_installed_tag.sh" + "hack/libdm_tag.sh" + "hack/libsubid_tag.sh")))) + (add-after 'install 'wrap-skopeo + (lambda _ + (wrap-program (string-append #$output "/bin/skopeo") + `("PATH" suffix + ("/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (home-page "https://github.com/containers/skopeo") (synopsis "Interact with container images and container image registries") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 09:05:26 2024 Received: (at 70115) by debbugs.gnu.org; 1 Apr 2024 13:05:26 +0000 Received: from localhost ([127.0.0.1]:49820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrHLq-0004jI-1D for submit@debbugs.gnu.org; Mon, 01 Apr 2024 09:05:26 -0400 Received: from out203-205-221-153.mail.qq.com ([203.205.221.153]:41911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1rrHLi-0004io-6P for 70115@debbugs.gnu.org; Mon, 01 Apr 2024 09:05:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1711976697; bh=I1+kZRPpZOls4/LUCcIBYEzX94bKLtNbquWHgKfuRas=; h=References:From:To:Cc:Subject:Date:In-reply-to; b=CP8DYa9HwquGFTnEF6Qld1SzIXrkbIdBN5kq8uA48rWMISqhvA7EYL5SV3PteYJyi Plv+53S9xT27rgqOoocoHTHdZQV0UWsh7CKklG/ZzeaTx2/BW+MoIsiK18W3+cgLBL WBorEx/nUYbZvGQ12TD5NTQfyJLDHvMAgIQ1c6uQ= Received: from m ([2409:8a28:f1d:5040::1000]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 1370B830; Mon, 01 Apr 2024 21:04:55 +0800 X-QQ-mid: xmsmtpt1711976695tvpdho0p9 Message-ID: X-QQ-XMAILINFO: NE3QucI8OULeFgKBIneH9+s5HPuoKrbBzVRtPDg+5C5OPUkkOARPSk0xFu9Q3G MfWk9wGwoGnXkANzvC18Mv9JqPLow9fxJ+HTC65Nph17LuSbobW7XVKZKpBMIQR//hkKktoU5GPu H9l/f0P6gbyQnQHLlS3RCqZV3lc+4dTIX7qqyUafNNUJk9rpPQANNkNCyoD2lioIyy/TKss+AIKG tX4KeRIrPiCqNBNue+ZchyJqaj4eR4mvMiVKD3HfOcG4K6TA/wOYhfWRBJRcolSSLbOBtEHVoAB9 YxEdAVZdbMG573XetJyCJAM2rv1eUolPIIOaJX7A/1pCq4YGMJe7DutYdZnNLRYiYNePggaoybl1 GvFSgohyOQQ1uQjkRC7FmAWljxdrXNO021AXirgBDMHZBp13+nq1KgGZPpmpPRkhB6Y1IoozLzbf DWUyi90ypXU9rgXB8Ogj9hqDFiYvlwbN2OMZAvsEDzlvdEqCg1ogEG2os8pSJZxh5hwFsCImbRL8 rZtZYAECn/DG+Lmxr7CUuojfSCI9gPPT6TNbJXzmmHSCaIthlnx53JeovoYRFipQR4dutd3S1t57 azXTN8u3b2mEcdi7K5dioKIIc24qrDu88DNofEwoGSuzThSlEYB5tp5GTnOJxZT/mrgYkgYmoDAH ST8emRj4pSrR8lbB3SJGutJJX9QYhxtQp5KAuGV0VOo7WFsvNIWHcnZOPvDD+1LMUiDO0VDXJLy0 XHCn2DW6kvOC+Uw1ZJebCLfQxsa8tKDTork69WmS7Qc9rkxZqVpnmkZPgzhUNpnULdZA3Muh4P/d nsZX8OMbLeAGP1dO+3ngofOsF6ikP6ZsGW4SmOZ8K4f0NL6cpdJeEwHpLhHw1ItgaIDwtbBIPOIz 1H04XK1oi5baPbsKTREdz9y5K+MFUQ/s6BnKaEzU8L5KdnaEXDIG78S2zt8TdMYY1HM1Fqccr0+M rn9BM18LomCw52DlZiLw== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= References: <071ced8c13ed07991da93082180cad133fe393aa.1711919102.git.~@wolfsden.cz> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Z572 <873216071@qq.com> To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#70115] [PATCH] gnu: skopeo: Update to 1.15.0. Date: Mon, 01 Apr 2024 20:37:45 +0800 In-reply-to: <071ced8c13ed07991da93082180cad133fe393aa.1711919102.git.~@wolfsden.cz> Message-ID: <874jcl44k2.fsf@qq.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 3.9 (+++) 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: Tomas Volf writes: > The package is also converted to gnu-build-system in order to take advantage > of already existing Makefile instead of reinventing (parts) of it in Guile. > > * gnu/packages/virtualization.scm (skop [...] Content analysis details: (3.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [203.205.221.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (873216071[at]qq.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (873216071[at]qq.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) X-Debbugs-Envelope-To: 70115 Cc: 70115@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: 2.9 (++) 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: Tomas Volf writes: > The package is also converted to gnu-build-system in order to take advantage > of already existing Makefile instead of reinventing (parts) of it in Guile. > > * gnu/packages/virtualization.scm (skop [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [203.205.221.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (873216071[at]qq.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (873216071[at]qq.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Tomas Volf <~@wolfsden.cz> writes: > The package is also converted to gnu-build-system in order to take advant= age > of already existing Makefile instead of reinventing (parts) of it in Guil= e. > > * gnu/packages/virtualization.scm (skopeo)[version]: Update to 1.15.0. > [build-system]: Use gnu-build-system. > [native-inputs]: Add go-1.21, sort. > [inputs]: Add bash-minimal. > [arguments]<#:import-path, #:install-source?>: Delete. > <#:make-flags, #:test-target, #:imported-modules>: New arguments. > <#:phases>{'configure}: Delete. > {'set-env, 'cc-to-gcc, 'wrap-skopeo, 'remove-go-references}: New phases. > > Change-Id: I1010e1f4fbdc093646c2879bdf30125ab2e88bdd > --- > This commit updates the skopeo, and also converts it to use > gnu-build-system. Both is done in one commit, since 1.15 did not > built just by straight-forward update, and due to the intended rewrite > the time spent debugging that would be wasted. > > This (gnu-build-system) matches how podman and buildah are done in #70112 > bringing all github.com/containers/* projects on the same model. > > gnu/packages/virtualization.scm | 80 ++++++++++++++++++++++----------- > 1 file changed, 54 insertions(+), 26 deletions(-) > > diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualizatio= n.scm > index 251fe00aa0..60f43c19cf 100644 > --- a/gnu/packages/virtualization.scm > +++ b/gnu/packages/virtualization.scm > @@ -151,6 +151,7 @@ (define-module (gnu packages virtualization) > #:use-module (guix gexp) > #:use-module (guix git-download) > #:use-module (guix packages) > + #:use-module (guix modules) > #:use-module (guix utils) > #:use-module (srfi srfi-1) > #:use-module (srfi srfi-26) > @@ -2257,7 +2258,7 @@ (define-public umoci > (define-public skopeo > (package > (name "skopeo") > - (version "1.2.3") > + (version "1.15.0") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -2266,12 +2267,15 @@ (define-public skopeo > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0n22sdif437ddg5ch0ipwim3fg0n6ihc9bfi52qkhy3r1grz04hs"))= )) > - (build-system go-build-system) > + "1f9n3ysdmll7vq8dmgpv03m8aqq3w9cfvbmxxpwmnv1nlfc67ihq"))= )) > + (build-system gnu-build-system) > (native-inputs > - (list pkg-config go-github-com-go-md2man)) > + (list go-1.21 > + go-github-com-go-md2man > + pkg-config)) > (inputs > - (list btrfs-progs > + (list bash-minimal > + btrfs-progs > eudev > libassuan > libselinux > @@ -2280,27 +2284,51 @@ (define-public skopeo > glib > gpgme)) > (arguments > - '(#:import-path "github.com/containers/skopeo" > - #:install-source? #f > - #:tests? #f ; The tests require Do= cker > - #:phases > - (modify-phases %standard-phases > - (replace 'build > - (lambda* (#:key import-path #:allow-other-keys) > - (with-directory-excursion (string-append "src/" import-path) > - (invoke "make" "bin/skopeo")))) > - (add-after 'build 'build-docs > - (lambda* (#:key import-path #:allow-other-keys) > - (with-directory-excursion (string-append "src/" import-path) > - (invoke "make" "docs")))) > - (replace 'install > - (lambda* (#:key import-path outputs #:allow-other-keys) > - (with-directory-excursion (string-append "src/" import-path) > - (let ((out (assoc-ref outputs "out"))) > - (install-file "default-policy.json" > - (string-append out "/etc/containers")) > - (invoke "make" "install-binary" "install-completions" "= install-docs" > - (string-append "PREFIX=3D" out))))))))) > + (list > + #:make-flags > + #~(list (string-append "CC=3D" #$(cc-for-target)) > + "PREFIX=3D" > + (string-append "DESTDIR=3D" #$output) > + (string-append "GOMD2MAN=3D" > + #$go-github-com-go-md2man "/bin/go-md2man")) > + #:tests? #f ; The tests require Docker > + #: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=3D/homeless-s= helter. > + (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. > + ;; > + ;; This techically does nothing *now*, but after upstream > + ;; issue[1] is solved and 'cc-to-gcc phase is removed, it = will > + ;; start being required. > + ;; 1: https://github.com/containers/skopeo/issues/2278 > + (setenv "CC" #$(cc-for-target)))) > + (add-after 'unpack 'cc-to-gcc > + (lambda _ > + (for-each (lambda (file) > + (substitute* file > + (("^cc -" all) > + (string-append "g" all)))) I don't think this is a good idea. Why not "$(CC)", this env can get from set-env phase. > + '("hack/btrfs_tag.sh" > + "hack/btrfs_installed_tag.sh" > + "hack/libdm_tag.sh" > + "hack/libsubid_tag.sh")))) > + (add-after 'install 'wrap-skopeo > + (lambda _ > + (wrap-program (string-append #$output "/bin/skopeo") > + `("PATH" suffix > + ("/run/setuid-programs"))))) It would be nice to add some comments about why need wrap /run/setuid-progr= ams . > + (add-after 'install 'remove-go-references > + (@@ (guix build go-build-system) remove-go-references))))) > (home-page "https://github.com/containers/skopeo") > (synopsis "Interact with container images and container image regist= ries") > (description --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYKsO4ACgkQO1qpk+Gi 3/BEPA/9HQurwrepNv47qTjU8MwuhyIyjApxUgVfj8bOyJ0OMqT7ZgctEgIuAdu8 s0B55l8B4DDGZYe9nn6pyXGuXmUKOxToaBUK4xUryiJf1RhY7V7FdX1xQMl1YI39 NB2h9h2lqBfru+AzF+hgtHY3vYCUMHW4+PGUvHiltMf4YZSzQYnWQSX0O37ex4B0 Q1PhYd+6jDsc+/qVsxO/USHU0V1HmnbciJzKCl5BJCNWm1mcZ6X5r3JNAO0me1Vf 2LWTfanDguwMByw8KK4rUA8oN6TQmvsJyJpzaWpJV8lYkhhWqjNloBKLYgVHjQS2 fHHqOHg5DnuWei642yF5Y0AE2oV+BsrLkCfxFPzl6BeOxjFoL+69jhFk/kvsuURK KiDBjAGAVCFXLrQwYpkHq0uiXUN7zMYXOYA/pat6PSV4xjv0iqmM2Ytqdjbe2UmO QU4D9sK30lCBhdH9p3isnddQeVJ7cNlB1apgnqZGD3JaNvSf5eDJ4Eo4MGwy/13E pEbYJuI9x/ds+yqx6+4FpFDgawi8MEdDgDbVHX2ve7tHqZYVUoTu32bppEoAn3ze OcfzYnR648zy0iFPtXsVwKe0PJrV5FODrk/aAHBNUOAKPSq1+3940hjqKL17u5Ks DCsAOcjxhzLe9ieND6KJoZar9FysOCjDt8Ogyr2v3c7PvahlpaM= =RIkg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 09:21:15 2024 Received: (at 70115) by debbugs.gnu.org; 1 Apr 2024 13:21:15 +0000 Received: from localhost ([127.0.0.1]:49832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrHb8-0007yK-H9 for submit@debbugs.gnu.org; Mon, 01 Apr 2024 09:21:15 -0400 Received: from wolfsden.cz ([37.205.8.62]:42744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rrHb3-0007y5-Hy for 70115@debbugs.gnu.org; Mon, 01 Apr 2024 09:21:13 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8EC392A11BA; Mon, 1 Apr 2024 13:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711977664; bh=YI+0T+QWfgkYBs3L6DUgNT/enUUSLMJKQmtqcpyGKzw=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=UZZcIaKSjtasC6i68oNTMaQ0BwAVYlr5MNaLp6G1tAX24fmj6cBdGYRuDEfPDvFID z6MDDJdjXwhn55PR2J9rzFC3wKkBaIpcm47stBUiheo5Kv/kgsNyTL2HLsRh4+RcrY Mxfwlg9MPnPY3ap4xzJXJx6TYvz/xlpj+owyY3sK6Rl/ArNVO+XBmoq0eOstjasewm k4wqUloZy3KTizc1UdqdZjr595j9WoNkM4C2oj97C5Sx97GkVg3vCGeyviAjsny0hP iqifGst+tpEKSadMA/qQX74e0pSS5t/NqTBe52McXFlRot7iJQlD1g0IwGHf8xmghK lxleaxu2aUB4xaxeGdMjvvascEWv+7APUsmdKkDW+gW+8nW3A5eo7ZOzGoujD+o+1n hyhvOstb3K/in3PvSmf/ZHCn6OMfkn/TsLUiu9QhIV20RWoE/VEyLMLGQl9vJBGEpA Wqn1x9y4HTdVJl0WZkUz+YlsYgvHnJ5T2FuiEqoXsLxd3JtEk4kPklfgMvgARNuC10 EKtq3iClWcmXAKyJf1ewktCYFNStnniOB8nFmVdKq62ueDDIBfYHjBfLdeqs68DwX9 CUkxrWMgRIn+xbI6q/BIjgDSol+ns9xe/5bc+Xd29B3X8fImXuFbHjF0XRlaFOCMSa wVTH2qcKJ4kJSaDGPon0q8wo= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.157]) by wolfsden.cz (Postfix) with ESMTPSA id A5E132A159F; Mon, 1 Apr 2024 13:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711977663; bh=YI+0T+QWfgkYBs3L6DUgNT/enUUSLMJKQmtqcpyGKzw=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=hnVUuMfl5UtDzGo0NMleTI6rG8GDfO3Yf6Ax7JIaG++f9cEv0MIUWJ6Ar5STOtb85 uodloJwArWw4zYonf9LRNyGJ6gf5iOGXNPsLnB1PwLXMIFGizyFIbsdhhXxF9h1hPv cFzJsDSV8epmfeVE18wopFsImOIujbq9LQhVvaJ4F2wtaki80yZxeVtgr54Ous1Iig WUXU5Ziu/cJBNnWAVDNbyQQx1CkmOprGzCuoklLVciZmfoF9oRPrRB6JWy5tOUTJZF tGuUBPfAKN+hNmqeRBQpOp8YVsB2QSUExYjBKfyunBiGgLdHD5yKpRKPU97tlV+u4x xyQa0hyJ7SfNzOyQbBtfzWwib+OiKHqNW8bTv3BgKtt+NcngHpk4fNzk5/fS5uhzTr wYD4SCEgBLVGNDcluBEtEqxGB9SdPGzXvzfKVk0YKRPV9nbhidRUnAGDl2Q5tl4AYh tmvh2ZGWXsUL1Eb9hamZ0AYXYg7yEjBlt8FL2aFrbD2BtxA0x6iDhRx3as6hzXcWls /l8LffvONbS0njmsSSZ8DA9iMX6xhG57oZhax9pKyH8W3+Hd+kykCtHQ7ucvCFVMpO NpFlTQKzeX1Su8nJ21zxBXKrqfY0QvtgxAdSXvq+RPS/UlHfbIssYhUzA1uaxjrZ8W fFER7mrt/S0L+1LVQQESUZok= Date: Mon, 1 Apr 2024 15:21:03 +0200 From: Tomas Volf <~@wolfsden.cz> To: Z572 <873216071@qq.com> Subject: Re: [bug#70115] [PATCH] gnu: skopeo: Update to 1.15.0. Message-ID: References: <071ced8c13ed07991da93082180cad133fe393aa.1711919102.git.~@wolfsden.cz> <874jcl44k2.fsf@qq.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="svBVo8/rVB8ypiiW" Content-Disposition: inline In-Reply-To: <874jcl44k2.fsf@qq.com> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70115 Cc: 70115@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 (-) --svBVo8/rVB8ypiiW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On 2024-04-01 20:37:45 +0800, Z572 wrote: > > Tomas Volf <~@wolfsden.cz> writes: > > > The package is also converted to gnu-build-system in order to take advantage > > of already existing Makefile instead of reinventing (parts) of it in Guile. > > > > * gnu/packages/virtualization.scm (skopeo)[version]: Update to 1.15.0. > > [build-system]: Use gnu-build-system. > > [native-inputs]: Add go-1.21, sort. > > [inputs]: Add bash-minimal. > > [arguments]<#:import-path, #:install-source?>: Delete. > > <#:make-flags, #:test-target, #:imported-modules>: New arguments. > > <#:phases>{'configure}: Delete. > > {'set-env, 'cc-to-gcc, 'wrap-skopeo, 'remove-go-references}: New phases. > > > > Change-Id: I1010e1f4fbdc093646c2879bdf30125ab2e88bdd > > --- > > This commit updates the skopeo, and also converts it to use > > gnu-build-system. Both is done in one commit, since 1.15 did not > > built just by straight-forward update, and due to the intended rewrite > > the time spent debugging that would be wasted. > > > > This (gnu-build-system) matches how podman and buildah are done in #70112 > > bringing all github.com/containers/* projects on the same model. > > > > gnu/packages/virtualization.scm | 80 ++++++++++++++++++++++----------- > > 1 file changed, 54 insertions(+), 26 deletions(-) > > > > diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm > > index 251fe00aa0..60f43c19cf 100644 > > --- a/gnu/packages/virtualization.scm > > +++ b/gnu/packages/virtualization.scm > > @@ -151,6 +151,7 @@ (define-module (gnu packages virtualization) > > #:use-module (guix gexp) > > #:use-module (guix git-download) > > #:use-module (guix packages) > > + #:use-module (guix modules) > > #:use-module (guix utils) > > #:use-module (srfi srfi-1) > > #:use-module (srfi srfi-26) > > @@ -2257,7 +2258,7 @@ (define-public umoci > > (define-public skopeo > > (package > > (name "skopeo") > > - (version "1.2.3") > > + (version "1.15.0") > > (source (origin > > (method git-fetch) > > (uri (git-reference > > @@ -2266,12 +2267,15 @@ (define-public skopeo > > (file-name (git-file-name name version)) > > (sha256 > > (base32 > > - "0n22sdif437ddg5ch0ipwim3fg0n6ihc9bfi52qkhy3r1grz04hs")))) > > - (build-system go-build-system) > > + "1f9n3ysdmll7vq8dmgpv03m8aqq3w9cfvbmxxpwmnv1nlfc67ihq")))) > > + (build-system gnu-build-system) > > (native-inputs > > - (list pkg-config go-github-com-go-md2man)) > > + (list go-1.21 > > + go-github-com-go-md2man > > + pkg-config)) > > (inputs > > - (list btrfs-progs > > + (list bash-minimal > > + btrfs-progs > > eudev > > libassuan > > libselinux > > @@ -2280,27 +2284,51 @@ (define-public skopeo > > glib > > gpgme)) > > (arguments > > - '(#:import-path "github.com/containers/skopeo" > > - #:install-source? #f > > - #:tests? #f ; The tests require Docker > > - #:phases > > - (modify-phases %standard-phases > > - (replace 'build > > - (lambda* (#:key import-path #:allow-other-keys) > > - (with-directory-excursion (string-append "src/" import-path) > > - (invoke "make" "bin/skopeo")))) > > - (add-after 'build 'build-docs > > - (lambda* (#:key import-path #:allow-other-keys) > > - (with-directory-excursion (string-append "src/" import-path) > > - (invoke "make" "docs")))) > > - (replace 'install > > - (lambda* (#:key import-path outputs #:allow-other-keys) > > - (with-directory-excursion (string-append "src/" import-path) > > - (let ((out (assoc-ref outputs "out"))) > > - (install-file "default-policy.json" > > - (string-append out "/etc/containers")) > > - (invoke "make" "install-binary" "install-completions" "install-docs" > > - (string-append "PREFIX=" out))))))))) > > + (list > > + #:make-flags > > + #~(list (string-append "CC=" #$(cc-for-target)) > > + "PREFIX=" > > + (string-append "DESTDIR=" #$output) > > + (string-append "GOMD2MAN=" > > + #$go-github-com-go-md2man "/bin/go-md2man")) > > + #:tests? #f ; The tests require Docker > > + #: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. > > + ;; > > + ;; This techically does nothing *now*, but after upstream > > + ;; issue[1] is solved and 'cc-to-gcc phase is removed, it will > > + ;; start being required. > > + ;; 1: https://github.com/containers/skopeo/issues/2278 > > + (setenv "CC" #$(cc-for-target)))) > > + (add-after 'unpack 'cc-to-gcc > > + (lambda _ > > + (for-each (lambda (file) > > + (substitute* file > > + (("^cc -" all) > > + (string-append "g" all)))) > > I don't think this is a good idea. Why not "$(CC)", this env can get > from set-env phase. I mean, sure, I could do that. I do not think it really matters, since I *know* we are building with gcc, but will change it. > > > + '("hack/btrfs_tag.sh" > > + "hack/btrfs_installed_tag.sh" > > + "hack/libdm_tag.sh" > > + "hack/libsubid_tag.sh")))) > > + (add-after 'install 'wrap-skopeo > > + (lambda _ > > + (wrap-program (string-append #$output "/bin/skopeo") > > + `("PATH" suffix > > + ("/run/setuid-programs"))))) > > It would be nice to add some comments about why need wrap /run/setuid-programs . Will do. > > > + (add-after 'install 'remove-go-references > > + (@@ (guix build go-build-system) remove-go-references))))) > > (home-page "https://github.com/containers/skopeo") > > (synopsis "Interact with container images and container image registries") > > (description > Thanks for review :) Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --svBVo8/rVB8ypiiW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmYKtL8ACgkQL7/ufbZ/ walswQ/7BpLAJG0Zrtv1gu8YzDqihCuU3yvih8IE+0qXmHWG4TR5W053+MBZRiGy bnoUYfdyJz+Uk4ACrpfRV8cN15fj+H9Wm7+opO0Pl3MhQzs8CcUCjenvD5g/DnZu 3dcTio40rYjw4RJYQa8HYIGg45cjYqb27GTnFKATTQPKMFoDEx6zkOK/x4IADKdQ gNyuHxa/KgotWQYId7lZIZXzodad3Z6bR2n7KddyrLF7mWszTN0Xqo22y1N//CPU Z3uucQ2pBDcJzHNHEsNzWYYyEmoJXyP6lVmUfDG7ubhN9kbF90yX1zLrrYNaplob 1KJOrCo+4gzAN2SnBLMvFQYuheJbrD7CEMsRwTZ8hUtEmoEts1rHKG5bcgZPqmJc 9635TvPnGeOdFD2hoIDRbgB9+XgAPcW5qm6b6OnFbSDgH81f76bUlWKrwCGUMkU+ XjzcXnpLNNzFO32nnrthkGrXWeGjobm3fOOzKyAmnIC6k+ZIfGTp0jAcrdZcMGFi rzONNHTfN1KsudT2+yRhlWnTUERbKSeJaHQu6YXVmsPF6Id0S2xTbnRGvOx1qaE0 n8YFRs95O8/rC1ju1mqC74bR/YK013mi+uSNuL/5J82B3K3RqQ7NI+V8Ts7g9GuN nszDGFDLAt+D29BqAhqoWTkpPSCvUF/JagXWbbY/uPENW9r0fHY= =3b6M -----END PGP SIGNATURE----- --svBVo8/rVB8ypiiW-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 09:53:04 2024 Received: (at 70115) by debbugs.gnu.org; 1 Apr 2024 13:53:04 +0000 Received: from localhost ([127.0.0.1]:49844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrI5v-0000fT-Uu for submit@debbugs.gnu.org; Mon, 01 Apr 2024 09:53:04 -0400 Received: from wolfsden.cz ([37.205.8.62]:35626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rrI5s-0000ew-Kb for 70115@debbugs.gnu.org; Mon, 01 Apr 2024 09:53:02 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C766B2A1607; Mon, 1 Apr 2024 13:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711979575; bh=FJjh+O25FTzUIfgrBL41Nu0VjmZ/o6ZbB3IwBQkRmzI=; h=From:To:Cc:Subject:Date; b=wdp9GVhevE7fKR5lmSpLXFSnfUjqEOFr0YZm5HhRyGpOmiYOJVz3HYDvDBKF13m7I yY/CFp8v+LXatVhDoOXqZ/OHwHYCLjSCj69HzQrz2aKNp3plxNFEcUfEigrJ3ji8rl LutkfwpcHrxhotnnQvFneSikYDRAE8s4nwOx6JDSVaz0gPxSjKN5HUWCTp+0okx/7e IEKQjBzqE9QCUX6xapSRDgx72gO7iNmElxEaYtR+8uPQllDyWcPhoI9fyhxtHibOXH Fo+p/bHQNL4AMO5g/LUNiX5YIhsbC9BhO2p64gpkSrVc+FUFCkOJodiFcQGSjvRjyZ x4apVgqiEMKL+iqE21Zk4mOirFZbTimUF35e75KZt4BH9B55FZbmhDwJuy+Qn1fhRT ySJMWyfqAgc2BRY8jH41X8dF4iH7LsKrJ1nLoJqBiTIBPQD0LoqbPoQnAsDMe5YzSA sV2Mp/s3qc83drt44o5cj25/354dB5vUdbcgzAdcVIHOe3FOnY0M4HTydM25+VEu8u gBr/QGTFAfFbEs/xxbnxhXp7pW3rxP4BlcC5I/TOdym9bCpWFwx6e+B/sSmYH1n28x s2m3iUTKPqUFxrsOnszcQEfvW6vdEV3GyhzgKant4JYXYiCudvCXYVqvmB/BXGJ1rU a/+r+78i3WMqyIrvFx5oD5RI= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from localhost (unknown [193.32.127.157]) by wolfsden.cz (Postfix) with ESMTPSA id 4FF9F2A0EFB; Mon, 1 Apr 2024 13:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711979575; bh=FJjh+O25FTzUIfgrBL41Nu0VjmZ/o6ZbB3IwBQkRmzI=; h=From:To:Cc:Subject:Date; b=wdp9GVhevE7fKR5lmSpLXFSnfUjqEOFr0YZm5HhRyGpOmiYOJVz3HYDvDBKF13m7I yY/CFp8v+LXatVhDoOXqZ/OHwHYCLjSCj69HzQrz2aKNp3plxNFEcUfEigrJ3ji8rl LutkfwpcHrxhotnnQvFneSikYDRAE8s4nwOx6JDSVaz0gPxSjKN5HUWCTp+0okx/7e IEKQjBzqE9QCUX6xapSRDgx72gO7iNmElxEaYtR+8uPQllDyWcPhoI9fyhxtHibOXH Fo+p/bHQNL4AMO5g/LUNiX5YIhsbC9BhO2p64gpkSrVc+FUFCkOJodiFcQGSjvRjyZ x4apVgqiEMKL+iqE21Zk4mOirFZbTimUF35e75KZt4BH9B55FZbmhDwJuy+Qn1fhRT ySJMWyfqAgc2BRY8jH41X8dF4iH7LsKrJ1nLoJqBiTIBPQD0LoqbPoQnAsDMe5YzSA sV2Mp/s3qc83drt44o5cj25/354dB5vUdbcgzAdcVIHOe3FOnY0M4HTydM25+VEu8u gBr/QGTFAfFbEs/xxbnxhXp7pW3rxP4BlcC5I/TOdym9bCpWFwx6e+B/sSmYH1n28x s2m3iUTKPqUFxrsOnszcQEfvW6vdEV3GyhzgKant4JYXYiCudvCXYVqvmB/BXGJ1rU a/+r+78i3WMqyIrvFx5oD5RI= From: Tomas Volf <~@wolfsden.cz> To: 70115@debbugs.gnu.org Subject: [PATCH v2] gnu: skopeo: Update to 1.15.0. Date: Mon, 1 Apr 2024 15:51:29 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70115 Cc: Tomas Volf <~@wolfsden.cz> 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 (-) The package is also converted to gnu-build-system in order to take advantage of already existing Makefile instead of reinventing (parts) of it in Guile. * gnu/packages/virtualization.scm (skopeo)[version]: Update to 1.15.0. [build-system]: Use gnu-build-system. [native-inputs]: Add go-1.21, sort. [inputs]: Add bash-minimal. [arguments]<#:import-path, #:install-source?>: Delete. <#:make-flags, #:test-target, #:imported-modules>: New arguments. <#:phases>{'configure}: Delete. {'set-env, 'cc-to-gcc, 'wrap-skopeo, 'remove-go-references}: New phases. Change-Id: I1010e1f4fbdc093646c2879bdf30125ab2e88bdd --- v2: - Use "$CC" instead of hard-coding gcc. - Add comment why /run/setuid-programs is required. gnu/packages/virtualization.scm | 81 ++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 251fe00aa0..34cccd6550 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -151,6 +151,7 @@ (define-module (gnu packages virtualization) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix modules) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -2257,7 +2258,7 @@ (define-public umoci (define-public skopeo (package (name "skopeo") - (version "1.2.3") + (version "1.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -2266,12 +2267,15 @@ (define-public skopeo (file-name (git-file-name name version)) (sha256 (base32 - "0n22sdif437ddg5ch0ipwim3fg0n6ihc9bfi52qkhy3r1grz04hs")))) - (build-system go-build-system) + "1f9n3ysdmll7vq8dmgpv03m8aqq3w9cfvbmxxpwmnv1nlfc67ihq")))) + (build-system gnu-build-system) (native-inputs - (list pkg-config go-github-com-go-md2man)) + (list go-1.21 + go-github-com-go-md2man + pkg-config)) (inputs - (list btrfs-progs + (list bash-minimal + btrfs-progs eudev libassuan libselinux @@ -2280,27 +2284,52 @@ (define-public skopeo glib gpgme)) (arguments - '(#:import-path "github.com/containers/skopeo" - #:install-source? #f - #:tests? #f ; The tests require Docker - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "bin/skopeo")))) - (add-after 'build 'build-docs - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "make" "docs")))) - (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (let ((out (assoc-ref outputs "out"))) - (install-file "default-policy.json" - (string-append out "/etc/containers")) - (invoke "make" "install-binary" "install-completions" "install-docs" - (string-append "PREFIX=" out))))))))) + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + "PREFIX=" + (string-append "DESTDIR=" #$output) + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) + #:tests? #f ; The tests require Docker + #: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. + ;; + ;; This techically does nothing *now*, but after upstream + ;; issue[1] is solved and 'cc-to-gcc phase is removed, it will + ;; start being required. + ;; 1: https://github.com/containers/skopeo/issues/2278 + (setenv "CC" #$(cc-for-target)))) + (add-after 'unpack 'cc-to-gcc + (lambda _ + (for-each (lambda (file) + (substitute* file + (("^cc( -.*)" all rest) + (string-append "\"$CC\"" rest)))) + '("hack/btrfs_tag.sh" + "hack/btrfs_installed_tag.sh" + "hack/libdm_tag.sh" + "hack/libsubid_tag.sh")))) + (add-after 'install 'wrap-skopeo + (lambda _ + (wrap-program (string-append #$output "/bin/skopeo") + `("PATH" suffix + ;; We need at least newuidmap, newgidmap and mount. + ("/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (home-page "https://github.com/containers/skopeo") (synopsis "Interact with container images and container image registries") (description -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 05 07:32:00 2024 Received: (at 70115-done) by debbugs.gnu.org; 5 Apr 2024 11:32:00 +0000 Received: from localhost ([127.0.0.1]:35295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rshnc-0000oZ-2e for submit@debbugs.gnu.org; Fri, 05 Apr 2024 07:32:00 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:48961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rshnZ-0000oO-Ki for 70115-done@debbugs.gnu.org; Fri, 05 Apr 2024 07:31:58 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id A6E9727BBE2; Fri, 5 Apr 2024 12:31:51 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6321cbe0; Fri, 5 Apr 2024 11:31:51 +0000 (UTC) From: Christopher Baines To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#70115] [PATCH v2] gnu: skopeo: Update to 1.15.0. In-Reply-To: (Tomas Volf's message of "Mon, 1 Apr 2024 15:51:29 +0200") References: <071ced8c13ed07991da93082180cad133fe393aa.1711919102.git.~@wolfsden.cz> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Fri, 05 Apr 2024 12:31:51 +0100 Message-ID: <87zfu8gi54.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70115-done Cc: 70115-done@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: text/plain Tomas Volf <~@wolfsden.cz> writes: > The package is also converted to gnu-build-system in order to take advantage > of already existing Makefile instead of reinventing (parts) of it in Guile. > > * gnu/packages/virtualization.scm (skopeo)[version]: Update to 1.15.0. > [build-system]: Use gnu-build-system. > [native-inputs]: Add go-1.21, sort. > [inputs]: Add bash-minimal. > [arguments]<#:import-path, #:install-source?>: Delete. > <#:make-flags, #:test-target, #:imported-modules>: New arguments. > <#:phases>{'configure}: Delete. > {'set-env, 'cc-to-gcc, 'wrap-skopeo, 'remove-go-references}: New phases. Thanks both, I've pushed this to master as 142e1c2cf0de55ea7803f1f175a6022c24fa467f. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYP4SdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeaTQ/6Aukmp8upiVGJi70p65FcEQxIyQ9hZOPY F8dMhS3JKyxa2PBgtivsVqGGMLIk0ZidrPWduODjWsggSgiY7skF5j4loDgyrXaD 2FqWaSuwd/d3jgxwDjQEtIGkqWyDL/sPxKfqud+K2lXKtiMr2q20Z2ZPm8JKvCF8 bT70urtk5/MLqbg1qQO/BV49r4YTLj/gzTD6w5jRhNlhSd0iicj1C4kScNBRM5V7 Cg5LJo+at2ZMBQe7XvVUVe0VDnkQHAxV7i8XdLqJQvzkrpl/j0TFWBfvKB0iI1fW nRM3vMwAS8228Ljr9ct3QAwoivXMR6sughCuaDtFfRV5WdaEqsjiVXVJ/8cTXXqT KCv5J7pCAWVQhgA30nGNtLaIhiusCjQB4/eNqkfG9WjXr2LlADuRbNkQA5Nua/pw 7JLW0D33BTZZl3LCIgCGLYsJfOYuvRg2lPb1EzA/EwMkNHLN7ZdSX1bYcZlmZM9Y fbU3BrvRWUZ8Ar1QqCidQHZ0TPGq4h9EWpaPAdUb/LxXNrU4cEMSC0GdxJMhCKy8 JrVZNuXr0eWVeR2vfAxXk3dVxHNjT2M1aufSmlvzgYc+MbX0F2KgQlbIjHlROo0W Ia8j8LnTiX99gU8W+WCFss5YL6AJOMQw30nIoeiU7uxTNhQezqK3AojqOnKX8NT7 j57Mpe/w4bY= =5jWo -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 16 20:49: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: Sat, 04 May 2024 11:24:07 +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