From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GB9+LFSxCmbfewEA62LTzQ:P1 (envelope-from ) for ; Mon, 01 Apr 2024 15:06:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GB9+LFSxCmbfewEA62LTzQ (envelope-from ) for ; Mon, 01 Apr 2024 15:06:28 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=CP8DYa9H; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711976788; a=rsa-sha256; cv=none; b=LTDWlNxA3yEWfMp/cEsy0R0GaRGXrOrzmCJeEbOM0CLIQZRpIQBX9+/P3pnokj1dLTH5VY uT7UQWOdZzJigroZRIu9zgQNt9kVcE4ofbVpHSzhKj8yzOzjckZblCJxhEoZ4tfS5df/e/ xEok98jsAeoWl3HdPAOlKnduma3SbCX13Lrg8trKVFFXvzgzYq2FP/+b/PJNFxKpp111m+ rUVttf49Oms4UmcAhN/bl2eiQyfsi4G6Afe0lS7S5lppbhpfEDXQO5PY0KFBGyFsGLJwAT 0ZMu3oeCIac8RUoOwnrzXz6xmAAAGcpzBi9bRjiWx4jLrS2B6e24cVaNB79MCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=CP8DYa9H; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711976788; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: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=I1+kZRPpZOls4/LUCcIBYEzX94bKLtNbquWHgKfuRas=; b=QxDIBAEVkby940zAP1rdP5xqn3K61naee3hUMK4seNbLIaDkFgohRE2YEydOM0AHhuiwxe VzcTW8W74pFmvL/wtMYRpaNpAJh5w9zU7ZD92csz9KBTwf/bcQkW3ULrPTMvqPfeBvVt8T n7FMvBCX8Yh201LXuIvM0Y+GUD9yEXR7dCI9ZH+EsaV4/LT5KoRCbWvRA7RVUAZvkt1eG4 uGU5a/2cK9ZuL84HdEdWr9tw0ntwdNN1ItQBVGkpyXebeN8AIBw8gQgP9LqRfPFGeZTjkx 9789dQRhb9UN1PQwQrckLT4hvq9hotAVHPoRKjOar9hEbm3q4E+YGJNlLM8JkA== 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 DC9A4341A4 for ; Mon, 1 Apr 2024 15:06:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrHMS-0004zf-61; Mon, 01 Apr 2024 09:06:04 -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 1rrHMO-0004yf-Tv for guix-patches@gnu.org; Mon, 01 Apr 2024 09:06: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 1rrHMM-0007YP-PH for guix-patches@gnu.org; Mon, 01 Apr 2024 09:05:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrHMP-0004kY-S1 for guix-patches@gnu.org; Mon, 01 Apr 2024 09:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70115] [PATCH] gnu: skopeo: Update to 1.15.0. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 13:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70115 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tomas Volf <~@wolfsden.cz> Cc: 70115@debbugs.gnu.org Received: via spool by 70115-submit@debbugs.gnu.org id=B70115.171197672618189 (code B ref 70115); Mon, 01 Apr 2024 13:06:01 +0000 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 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-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: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches From: Z572 via Guix-patches via 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-Spam-Score: -3.55 X-Migadu-Queue-Id: DC9A4341A4 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.55 X-TUID: iY5bMYFI0kFV --=-=-= 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----- --=-=-=--