From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 29 09:45:04 2020 Received: (at submit) by debbugs.gnu.org; 29 Aug 2020 13:45:04 +0000 Received: from localhost ([127.0.0.1]:48056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kC1AG-0008DQ-5F for submit@debbugs.gnu.org; Sat, 29 Aug 2020 09:45:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:52928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kC1AE-0008DH-Ip for submit@debbugs.gnu.org; Sat, 29 Aug 2020 09:45:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kC1AD-0003Tw-Cw for guix-patches@gnu.org; Sat, 29 Aug 2020 09:45:01 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:34564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kC1AA-0002E3-Q9 for guix-patches@gnu.org; Sat, 29 Aug 2020 09:45:01 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 922173ad for ; Sat, 29 Aug 2020 13:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=H0t a9oQDZwALu7CDSND63hCo6JdCjS66mSqG5xLckIE=; b=iUBFmWxsOx72unm6pZL 1LAvKaEd7WR1nrixBTKW+Fz4p5OwUUn+pIwVagW591hDgb1W/f2K0IK4FOlcQ3GY QmsFn7JxzMFt4ajEBip3OMm4S2eQpd+2MK/v70mAHqYlFwm/5eSgQP283DBbZwEb 8ej26s2H46fLsIlIV9GRHad9NnTZ8sTy2B0AgzNAc0IPJl7crzEGFZPsdBQKiBrq keQJCzjfhVOuqF1qIDXwJtGp08xlbNq1L3YGdoZXNgwOczJEJVdehAEq1KysILuw Fq7LUJV8nypYs00JGWYNpjJPunpcAxVBqEuCtpmyC3aXH78tRRzWjYp6yIFoO9TE 5HQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 94532f2b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 29 Aug 2020 13:44:52 +0000 (UTC) Date: Sat, 29 Aug 2020 15:44:45 +0200 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] Add version number in release ISO Message-ID: <20200829154445.5512d99a@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/P3HHZ==llbC0YlgTya0gJ34" Received-SPF: none client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit 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: -3.3 (---) --MP_/P3HHZ==llbC0YlgTya0gJ34 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, I've recently proposed a patch to libosinfo database, and they suggested that we add the version number to the ISO label, so the tool can differentiate and identify the ISOs. See https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/202 The first patch adds the --label option to guix system, and it sets the label for the boot partition. The second patch simply uses it and adds a --label option to the release target in the Makefile. --MP_/P3HHZ==llbC0YlgTya0gJ34 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-guix-system-Add-label-option.patch >From a6d4cb90825b9e45c0baeaeaa653c57a9100b21a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 29 Aug 2020 15:34:56 +0200 Subject: [PATCH 1/2] guix: system: Add `--label' option. * guix/scripts/system.scm (%options): Add `--label'. --- guix/scripts/system.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f6d20382b6..c9cee2e2a2 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -662,7 +662,7 @@ checking this by themselves in their 'check' procedure." (define* (system-derivation-for-action os base-image action #:key image-size file-system-type full-boot? container-shared-network? - mappings) + mappings label) "Return as a monadic value the derivation for OS according to ACTION." (case action ((build init reconfigure) @@ -688,7 +688,14 @@ checking this by themselves in their 'check' procedure." (image (inherit base-image) (size image-size) - (operating-system os))))) + (operating-system os) + (partitions (match (image-partitions base-image) + ((boot others ...) + (cons + ((@ (gnu image) partition) + (inherit boot) + (label (or label (partition-label boot)))) + others)))))))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?)))) @@ -741,7 +748,7 @@ and TARGET arguments." install-bootloader? dry-run? derivations-only? use-substitutes? bootloader-target target - image-size file-system-type full-boot? + image-size file-system-type full-boot? label container-shared-network? (mappings '()) (gc-root #f)) @@ -795,6 +802,7 @@ static checks." ((target* (current-target-system)) (image -> (find-image file-system-type target*)) (sys (system-derivation-for-action os image action + #:label label #:file-system-type file-system-type #:image-size image-size #:full-boot? full-boot? @@ -942,6 +950,8 @@ Some ACTIONS support additional ARGS.\n")) --image-size=SIZE for 'vm-image', produce an image of SIZE")) (display (G_ " --no-bootloader for 'init', do not install a bootloader")) + (display (G_ " + --label=LABEL for 'disk-image', label disk image with LABEL")) (display (G_ " --save-provenance save provenance information")) (display (G_ " @@ -1008,6 +1018,9 @@ Some ACTIONS support additional ARGS.\n")) (option '("no-bootloader" "no-grub") #f #f (lambda (opt name arg result) (alist-cons 'install-bootloader? #f result))) + (option '("label") #t #f + (lambda (opt name arg result) + (alist-cons 'label arg result))) (option '("full-boot") #f #f (lambda (opt name arg result) (alist-cons 'full-boot? #t result))) @@ -1065,7 +1078,8 @@ Some ACTIONS support additional ARGS.\n")) (validate-reconfigure . ,ensure-forward-reconfigure) (file-system-type . "ext4") (image-size . guess) - (install-bootloader? . #t))) + (install-bootloader? . #t) + (label . #f))) (define (verbosity-level opts) "Return the verbosity level based on OPTS, the alist of parsed options." @@ -1119,6 +1133,7 @@ resulting from command-line parsing." (dry? (assoc-ref opts 'dry-run?)) (bootloader? (assoc-ref opts 'install-bootloader?)) + (label (assoc-ref opts 'label)) (target-file (match args ((first second) second) (_ #f))) @@ -1169,6 +1184,7 @@ resulting from command-line parsing." (_ #f)) opts) #:install-bootloader? bootloader? + #:label label #:target target-file #:bootloader-target bootloader-target #:gc-root (assoc-ref opts 'gc-root))))) -- 2.28.0 --MP_/P3HHZ==llbC0YlgTya0gJ34 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-Makefile.am-Set-iso-label.patch >From cd47229d93b6dd0d7a793230e6a103a40034f6a7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 29 Aug 2020 15:36:40 +0200 Subject: [PATCH 2/2] Makefile.am: Set iso label. * Makefile.am (release): Add version number in disk image label. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 9c38c2f83c..7a658d157b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -838,6 +838,7 @@ release: dist-with-updated-version image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ --file-system-type=iso9660 \ + --label="GUIX_IMAGE_$(VERSION)" \ --system=$$system --fallback \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ -- 2.28.0 --MP_/P3HHZ==llbC0YlgTya0gJ34-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 09:47:15 2020 Received: (at 43101) by debbugs.gnu.org; 30 Aug 2020 13:47:15 +0000 Received: from localhost ([127.0.0.1]:49663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCNfu-0000eg-L2 for submit@debbugs.gnu.org; Sun, 30 Aug 2020 09:47:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCNfr-0000Xd-JY for 43101@debbugs.gnu.org; Sun, 30 Aug 2020 09:47:12 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39985) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCNfl-0003Dv-OO; Sun, 30 Aug 2020 09:47:05 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41834 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kCNfl-0003B7-Bq; Sun, 30 Aug 2020 09:47:05 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Julien Lepiller Subject: Re: [bug#43101] [PATCH] Add version number in release ISO References: <20200829154445.5512d99a@tachikoma.lepiller.eu> Date: Sun, 30 Aug 2020 15:47:04 +0200 In-Reply-To: <20200829154445.5512d99a@tachikoma.lepiller.eu> (Julien Lepiller's message of "Sat, 29 Aug 2020 15:44:45 +0200") Message-ID: <87d038i6uf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43101 Cc: 43101@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: -3.3 (---) Hi, Julien Lepiller skribis: > I've recently proposed a patch to libosinfo database, and they > suggested that we add the version number to the ISO label, so the tool > can differentiate and identify the ISOs. See > https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/202 Good idea. >>>From a6d4cb90825b9e45c0baeaeaa653c57a9100b21a Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Sat, 29 Aug 2020 15:34:56 +0200 > Subject: [PATCH 1/2] guix: system: Add `--label' option. > > * guix/scripts/system.scm (%options): Add `--label'. Please describe the other changes (to =E2=80=98system-derivation-for-action= =E2=80=99, etc.) > + (partitions (match (image-partitions base-image) > + ((boot others ...) > + (cons > + ((@ (gnu image) partition) > + (inherit boot) > + (label (or label (partition-label boot)))) Please include (gnu image) and avoid =E2=80=98@=E2=80=99. > + (display (G_ " > + --label=3DLABEL for 'disk-image', label disk image with LABEL= ")) Make sure to add it to doc/guix.texi as well. >>>From cd47229d93b6dd0d7a793230e6a103a40034f6a7 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Sat, 29 Aug 2020 15:36:40 +0200 > Subject: [PATCH 2/2] Makefile.am: Set iso label. > > * Makefile.am (release): Add version number in disk image label. LGTM. Thank you! :-) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 10:35:44 2020 Received: (at 43101) by debbugs.gnu.org; 30 Aug 2020 14:35:44 +0000 Received: from localhost ([127.0.0.1]:50484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOQq-0004UD-7C for submit@debbugs.gnu.org; Sun, 30 Aug 2020 10:35:44 -0400 Received: from lepiller.eu ([89.234.186.109]:47024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOQn-0004U3-By for 43101@debbugs.gnu.org; Sun, 30 Aug 2020 10:35:42 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fcc20bdd; Sun, 30 Aug 2020 14:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=NrBPnLU3bF+WhKAe4v5oIPx+teIQ7c6mC/A4iEIcpXc=; b=X/tGEx2 8w5zTaLZIDPI3JXYxi62dLLfGXZS1JlTEV22nmPpV51a9l1laLra376opzvROTt7 Y5oWg9WSonwKqkZvzGv2zMs8gaEIV04pi7XvevJD9pBhS/WF5o3BhKk+VFYqZepF jwi+4EioM+YlyGYqp2kAJRCqphTIm9cMw+yH+KxguSGbY+L+DHyzvFkPetAUYYif 27cUBFfZ90gJaULsJLYiBvXLj7FtxtRXfDrWoWWSu0sizb4oVF5TfzEcyOMsAXuD G2BwaoB1rBhSg+hfxny0TRP00PnIECSfXie6GzPr+jQxBzaDyorUo420sSv0Y1sn DUTKLF3W2/FTgIQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f70250f1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 30 Aug 2020 14:35:37 +0000 (UTC) Date: Sun, 30 Aug 2020 10:35:24 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <87d038i6uf.fsf@gnu.org> References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [bug#43101] [PATCH] Add version number in release ISO To: =?ISO-8859-1?Q?Ludovic_Court=E8s?= From: Julien Lepiller Message-ID: <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43101 Cc: 43101@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 (-) Le 30 ao=C3=BBt 2020 09:47:04 GMT-04:00, "Ludovic Court=C3=A8s" a =C3=A9crit : >Hi, > >Julien Lepiller skribis: > >> I've recently proposed a patch to libosinfo database, and they >> suggested that we add the version number to the ISO label, so the >tool >> can differentiate and identify the ISOs=2E See >> https://gitlab=2Ecom/libosinfo/osinfo-db/-/merge_requests/202 > >Good idea=2E > >>>>From a6d4cb90825b9e45c0baeaeaa653c57a9100b21a Mon Sep 17 00:00:00 >2001 >> From: Julien Lepiller >> Date: Sat, 29 Aug 2020 15:34:56 +0200 >> Subject: [PATCH 1/2] guix: system: Add `--label' option=2E >> >> * guix/scripts/system=2Escm (%options): Add `--label'=2E > >Please describe the other changes (to =E2=80=98system-derivation-for-acti= on=E2=80=99, >etc=2E) > >> + (partitions (match (image-partitions base-image) >> + ((boot others =2E=2E=2E) >> + (cons >> + ((@ (gnu image) partition) >> + (inherit boot) >> + (label (or label (partition-label >boot)))) > >Please include (gnu image) and avoid =E2=80=98@=E2=80=99=2E (gnu image) is already imported, but conflicts with another module for par= tition, leading to a compilation error=2E What should I do? > >> + (display (G_ " >> + --label=3DLABEL for 'disk-image', label disk image with >LABEL")) > >Make sure to add it to doc/guix=2Etexi as well=2E > >>>>From cd47229d93b6dd0d7a793230e6a103a40034f6a7 Mon Sep 17 00:00:00 >2001 >> From: Julien Lepiller >> Date: Sat, 29 Aug 2020 15:36:40 +0200 >> Subject: [PATCH 2/2] Makefile=2Eam: Set iso label=2E >> >> * Makefile=2Eam (release): Add version number in disk image label=2E > >LGTM=2E I'll add the architecture in there too, as per discussion in the osinfo-db= MR=2E > >Thank you! :-) > >Ludo=E2=80=99=2E From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 11:05:39 2020 Received: (at 43101) by debbugs.gnu.org; 30 Aug 2020 15:05:39 +0000 Received: from localhost ([127.0.0.1]:50530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOtn-0005Ez-Jb for submit@debbugs.gnu.org; Sun, 30 Aug 2020 11:05:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOtm-0005En-Dr for 43101@debbugs.gnu.org; Sun, 30 Aug 2020 11:05:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40614) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCOte-0003Ks-RZ; Sun, 30 Aug 2020 11:05:30 -0400 Received: from [2a01:e0a:19b:d9a0:24e2:2545:c1f2:cf9e] (port=57494 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kCOtd-0001RZ-KO; Sun, 30 Aug 2020 11:05:30 -0400 From: Mathieu Othacehe To: Julien Lepiller Subject: Re: [bug#43101] [PATCH] Add version number in release ISO References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> Date: Sun, 30 Aug 2020 17:05:27 +0200 In-Reply-To: <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> (Julien Lepiller's message of "Sun, 30 Aug 2020 10:35:24 -0400") Message-ID: <87v9h0p420.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43101 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 43101@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: -3.3 (---) Hello Julien, Thanks for this patch! >>Please include (gnu image) and avoid =E2=80=98@=E2=80=99. > > (gnu image) is already imported, but conflicts with another module for pa= rtition, leading to a compilation error. What should I do? You can maybe write something like: --8<---------------cut here---------------start------------->8--- #:use-module ((srfi srfi-1) #:hide (partition)) --8<---------------cut here---------------end--------------->8--- > I'll add the architecture in there too, as per discussion in the osinfo-d= b MR. Do you think it could be useful to add the same mechanism to ISO images built by the CI? In that case, you could maybe use the same mechanism in (gnu ci) and label the boot partition with %guix-version? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 11:11:25 2020 Received: (at 43101) by debbugs.gnu.org; 30 Aug 2020 15:11:25 +0000 Received: from localhost ([127.0.0.1]:50538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOzN-0005NS-F7 for submit@debbugs.gnu.org; Sun, 30 Aug 2020 11:11:25 -0400 Received: from lepiller.eu ([89.234.186.109]:47050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCOzL-0005NK-G5 for 43101@debbugs.gnu.org; Sun, 30 Aug 2020 11:11:24 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 49bc5f36; Sun, 30 Aug 2020 15:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=+L5zMPelG7IEKq5tq9EVgiVU6XP25zfBf7bXoxMoYFA=; b=l76uGYm jR//1tjRuPQnePPsA/M5vbozKJ8PiNceaFtuHQ4SjEDtyFfuBxIM/M8YhXjzPz5f 4C1XHogF5KFyhR9Q3ckwn+WfjGwcE6fS3o+L8rkSiJCbWBLpkrT1+S8J3hT58OKQ eDG/NRUdlTsUzhur5LS/ga8+pwGgDFjB4gdIka1qh9WpUGbYgMiwu9kU1CcyhBbA 30ReJBpSKinZMjpaKxAxL7tIIYLmOcxi8zkCLpClpkSDlU48uFUu4/6quEoc3P1+ z9uLE09IrKoUt4XdoEK3KPZRT0Ea1GfKhCnfEK+r7FcteWlPkCB7pDb3g8nZgSMQ 38solGvhHNzmCKw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 56bd553c (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 30 Aug 2020 15:11:21 +0000 (UTC) Date: Sun, 30 Aug 2020 11:11:08 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <87v9h0p420.fsf@gnu.org> References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----J3TDFQNF1EGO9YF3U2KF54FS3E3G4K" Content-Transfer-Encoding: 7bit Subject: Re: [bug#43101] [PATCH] Add version number in release ISO To: Mathieu Othacehe From: Julien Lepiller Message-ID: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43101 Cc: =?ISO-8859-1?Q?Ludovic_Court=E8s?= , 43101@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 (-) ------J3TDFQNF1EGO9YF3U2KF54FS3E3G4K Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Yes, it makes sense! I'll send a patch for that too=2E Thank you! Le 30 ao=C3=BBt 2020 11:05:27 GMT-04:00, Mathieu Othacehe a =C3=A9crit : > >Hello Julien, > >Thanks for this patch! > >>>Please include (gnu image) and avoid =E2=80=98@=E2=80=99=2E >> >> (gnu image) is already imported, but conflicts with another module >for partition, leading to a compilation error=2E What should I do? > >You can maybe write something like: > >--8<---------------cut here---------------start------------->8--- >#:use-module ((srfi srfi-1) #:hide (partition)) >--8<---------------cut here---------------end--------------->8--- > >> I'll add the architecture in there too, as per discussion in the >osinfo-db MR=2E > >Do you think it could be useful to add the same mechanism to ISO images >built by the CI? In that case, you could maybe use the same mechanism >in >(gnu ci) and label the boot partition with %guix-version? > >Thanks, > >Mathieu ------J3TDFQNF1EGO9YF3U2KF54FS3E3G4K Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Yes, it makes sense! I'll send a patch for that to= o=2E Thank you!

Le 30 ao=C3=BBt 2020 11:0= 5:27 GMT-04:00, Mathieu Othacehe <othacehe@gnu=2Eorg> a =C3=A9crit :<= blockquote class=3D"gmail_quote" style=3D"margin: 0pt 0pt 0pt 0=2E8ex; bord= er-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> 

Hello Julien,

Thanks for this patch!
<=
br>
Please include (gnu image) and avoid =E2=80=98@=
=E2=80=99=2E

 (gnu image) is already imported, but conf=
licts with another module for partition, leading to a compilation error=2E =
What should I do?

You can maybe write something like:
--8<---------------cut here---------------start------------->8-=
--
#:use-module ((srfi srfi-1) #:hide (partition))
--8<-----------=
----cut here---------------end--------------->8---

I'll add the architecture in there too, =
as per discussion in the osinfo-db MR=2E

Do you think i=
t could be useful to add the same mechanism to ISO images
built by the C=
I? In that case, you could maybe use the same mechanism in
(gnu ci) and =
label the boot partition with %guix-version?

Thanks,

Mathieu<=
br>
------J3TDFQNF1EGO9YF3U2KF54FS3E3G4K-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 15:52:47 2020 Received: (at 43101) by debbugs.gnu.org; 30 Aug 2020 19:52:47 +0000 Received: from localhost ([127.0.0.1]:50810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCTNb-0005gT-Ar for submit@debbugs.gnu.org; Sun, 30 Aug 2020 15:52:47 -0400 Received: from lepiller.eu ([89.234.186.109]:47238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCTNY-0005gK-SK for 43101@debbugs.gnu.org; Sun, 30 Aug 2020 15:52:42 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a1d29400; Sun, 30 Aug 2020 19:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type; s=dkim; bh=tQWw6cGHTL1RIiwKub4lpfAKakqN4AZwdw3HyR CFLw4=; b=MD2bv68D8O4G5kIyJ/YTKs2pCyUDP1vq6VmEvkDxvjFVcxgRT8wL9y S+I+H/24xjo+LOoxG0Zw3J5f+hQHl+86GxOJmstskxMcHoS0agmx9IJYS74Mlufm h4BFaYrDCcQd8i8kvCPa9GjcrsYRvkhuLOT0Ho9juLG2hYl8M3/cH45gRQ/5ACtj Qthndp3G8btjOWJQHz7xaf5w2Juv0gPWPahSFen5YAt8t1wSicLVPdXnwfqo+Rjp F2HCEDuV27q3fDAtng/N73+k3DAj9HfaU2IejPk+hN1yg5hZLVTZK6S7FHIxaqz8 MuOR7bnSPK7hKrZIGK2lyuuS5iHGCn/A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7465d6da (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 30 Aug 2020 19:52:38 +0000 (UTC) Date: Sun, 30 Aug 2020 21:52:30 +0200 From: Julien Lepiller To: Mathieu Othacehe Subject: Re: [bug#43101] [PATCH v2] Add version number in release ISO Message-ID: <20200830215230.3dd526fd@tachikoma.lepiller.eu> In-Reply-To: References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/BeX4bW4G5pxTPKcgCN81SNR" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43101 Cc: Ludovic =?UTF-8?B?Q291cnTDqHM=?= , 43101@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 (-) --MP_/BeX4bW4G5pxTPKcgCN81SNR Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Here's v2 of the patch series. I've added one patch to (gnu ci) to set the version number in generated ISOs, and fixed other issues in the previous version of the patches. Le Sun, 30 Aug 2020 11:11:08 -0400, Julien Lepiller a =C3=A9crit : > Yes, it makes sense! I'll send a patch for that too. Thank you! >=20 > Le 30 ao=C3=BBt 2020 11:05:27 GMT-04:00, Mathieu Othacehe > a =C3=A9crit : > > > >Hello Julien, > > > >Thanks for this patch! > > =20 > >>>Please include (gnu image) and avoid =E2=80=98@=E2=80=99. =20 > >> > >> (gnu image) is already imported, but conflicts with another module > >> =20 > >for partition, leading to a compilation error. What should I do? > > > >You can maybe write something like: > > > >--8<---------------cut here---------------start------------->8--- > >#:use-module ((srfi srfi-1) #:hide (partition)) > >--8<---------------cut here---------------end--------------->8--- > > =20 > >> I'll add the architecture in there too, as per discussion in the =20 > >osinfo-db MR. > > > >Do you think it could be useful to add the same mechanism to ISO > >images built by the CI? In that case, you could maybe use the same > >mechanism in > >(gnu ci) and label the boot partition with %guix-version? > > > >Thanks, > > > >Mathieu =20 --MP_/BeX4bW4G5pxTPKcgCN81SNR Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-guix-system-Add-label-option.patch =46rom a502fa70b0230d3f91ddf05410f24a1f4fcad521 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 29 Aug 2020 15:34:56 +0200 Subject: [PATCH 1/3] guix: system: Add `--label' option. * guix/scripts/system.scm (%options): Add `--label'. (system-derivation-for-action): Take a #:label key to set volume ID. (perform-action): Take a #:label key. (%default-options): Add default label value. (process-action): Pass label value from command-line to perform-action. --- doc/guix.texi | 4 +++- guix/scripts/system.scm | 27 ++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6206a93857..56b1cd8976 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28836,7 +28836,9 @@ the @option{--image-size} option is ignored in the = case of @code{docker-image}. =20 You can specify the root file system type by using the -@option{--file-system-type} option. It defaults to @code{ext4}. +@option{--file-system-type} option. It defaults to @code{ext4}. When its +value is @code{iso9660}, the @option{--label} option can be used to specify +a volume ID with @code{disk-image}. =20 When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f6d20382b6..33f4c8e4e8 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -6,6 +6,7 @@ ;;; Copyright =C2=A9 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Christopher Baines ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright =C2=A9 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,7 +68,7 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services herd) - #:use-module (srfi srfi-1) + #:use-module ((srfi srfi-1) #:hide (partition)) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) @@ -662,7 +663,7 @@ checking this by themselves in their 'check' procedure." (define* (system-derivation-for-action os base-image action #:key image-size file-system-type full-boot? container-shared-network? - mappings) + mappings label) "Return as a monadic value the derivation for OS according to ACTION." (case action ((build init reconfigure) @@ -688,7 +689,14 @@ checking this by themselves in their 'check' procedure= ." (image (inherit base-image) (size image-size) - (operating-system os))))) + (operating-system os) + (partitions (match (image-partitions base-image) + ((boot others ...) + (cons + (partition + (inherit boot) + (label (or label (partition-label boot)))) + others)))))))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?))= )) =20 @@ -741,7 +749,7 @@ and TARGET arguments." install-bootloader? dry-run? derivations-only? use-substitutes? bootloader-target target - image-size file-system-type full-boot? + image-size file-system-type full-boot? label container-shared-network? (mappings '()) (gc-root #f)) @@ -795,6 +803,7 @@ static checks." ((target* (current-target-system)) (image -> (find-image file-system-type target*)) (sys (system-derivation-for-action os image action + #:label label #:file-system-type file-sy= stem-type #:image-size image-size #:full-boot? full-boot? @@ -942,6 +951,8 @@ Some ACTIONS support additional ARGS.\n")) --image-size=3DSIZE for 'vm-image', produce an image of SIZE")) (display (G_ " --no-bootloader for 'init', do not install a bootloader")) + (display (G_ " + --label=3DLABEL for 'disk-image', label disk image with LABEL")) (display (G_ " --save-provenance save provenance information")) (display (G_ " @@ -1008,6 +1019,9 @@ Some ACTIONS support additional ARGS.\n")) (option '("no-bootloader" "no-grub") #f #f (lambda (opt name arg result) (alist-cons 'install-bootloader? #f result))) + (option '("label") #t #f + (lambda (opt name arg result) + (alist-cons 'label arg result))) (option '("full-boot") #f #f (lambda (opt name arg result) (alist-cons 'full-boot? #t result))) @@ -1065,7 +1079,8 @@ Some ACTIONS support additional ARGS.\n")) (validate-reconfigure . ,ensure-forward-reconfigure) (file-system-type . "ext4") (image-size . guess) - (install-bootloader? . #t))) + (install-bootloader? . #t) + (label . #f))) =20 (define (verbosity-level opts) "Return the verbosity level based on OPTS, the alist of parsed options." @@ -1119,6 +1134,7 @@ resulting from command-line parsing." =20 (dry? (assoc-ref opts 'dry-run?)) (bootloader? (assoc-ref opts 'install-bootloader?)) + (label (assoc-ref opts 'label)) (target-file (match args ((first second) second) (_ #f))) @@ -1169,6 +1185,7 @@ resulting from command-line parsing." (_ #f)) opts) #:install-bootloader? bootloader? + #:label label #:target target-file #:bootloader-target bootloader-target #:gc-root (assoc-ref opts 'gc-root))))) --=20 2.28.0 --MP_/BeX4bW4G5pxTPKcgCN81SNR Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-ci-Set-label-in-iso9660-jobs.patch =46rom d98a5b9d36a74d47348a5a838209993f6b2539e0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 30 Aug 2020 20:43:42 +0200 Subject: [PATCH 2/3] gnu: ci: Set label in iso9660 jobs. * gnu/ci.scm (image-jobs): Set label of generated ISOs. --- gnu/ci.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index af0bb66775..c15baa99d3 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 = Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2017 Jan Nieuwenhuizen ;;; Copyright =C2=A9 2018, 2019 Cl=C3=A9ment Lassieur +;;; Copyright =C2=A9 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (guix profiles) #:use-module (guix packages) #:use-module (guix channels) + #:use-module (guix config) #:use-module (guix derivations) #:use-module (guix build-system) #:use-module (guix monads) @@ -234,7 +236,15 @@ system.") (build-image (image (inherit iso9660-image) - (operating-system installation-os)))) + (operating-system installation-os) + (partitions (match (image-partitions iso9660-image) + ((boot others ...) + (cons + (partition + (inherit boot) + (label (string-append "GUIX_" system = "_" + %guix-version))) + others))))))) ;; Only cross-compile Guix System images from x86_64-linux for now. ,@(if (string=3D? system "x86_64-linux") (map (lambda (image) --=20 2.28.0 --MP_/BeX4bW4G5pxTPKcgCN81SNR Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-Makefile.am-Set-iso-label.patch >From 2e8ca2e8ece588932d00d1bc12182e9a9a7f53e3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 29 Aug 2020 15:36:40 +0200 Subject: [PATCH 3/3] Makefile.am: Set iso label. * Makefile.am (release): Add version number in disk image label. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 4c10bd37bc..063556c7ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -834,6 +834,7 @@ release: dist-with-updated-version image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ --file-system-type=iso9660 \ + --label="GUIX_$${system}_$(VERSION)" \ --system=$$system --fallback \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ -- 2.28.0 --MP_/BeX4bW4G5pxTPKcgCN81SNR-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 31 02:19:08 2020 Received: (at 43101) by debbugs.gnu.org; 31 Aug 2020 06:19:08 +0000 Received: from localhost ([127.0.0.1]:51347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCd9c-0008Kc-6c for submit@debbugs.gnu.org; Mon, 31 Aug 2020 02:19:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCd9a-0008KQ-GR for 43101@debbugs.gnu.org; Mon, 31 Aug 2020 02:18:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51143) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCd9T-0007MA-SG; Mon, 31 Aug 2020 02:18:47 -0400 Received: from [2a01:e0a:19b:d9a0:24e2:2545:c1f2:cf9e] (port=36044 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kCd9T-00069g-Ae; Mon, 31 Aug 2020 02:18:47 -0400 From: Mathieu Othacehe To: Julien Lepiller Subject: Re: [bug#43101] [PATCH v2] Add version number in release ISO References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> <20200830215230.3dd526fd@tachikoma.lepiller.eu> Date: Mon, 31 Aug 2020 08:18:44 +0200 In-Reply-To: <20200830215230.3dd526fd@tachikoma.lepiller.eu> (Julien Lepiller's message of "Sun, 30 Aug 2020 21:52:30 +0200") Message-ID: <87r1rnibi3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43101 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 43101@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 (-) Hey Julien, Thanks for the v2 :) > (inherit iso9660-image) > - (operating-system installation-os)))) > + (operating-system installation-os) > + (partitions (match (image-partitions iso9660-image) > + ((boot others ...) > + (cons > + (partition > + (inherit boot) > + (label (string-append "GUIX_" system "_" > + %guix-version))) > + others))))))) We could maybe factorize this in something like: --8<---------------cut here---------------start------------->8--- (define (image-with-label image label) ...) --8<---------------cut here---------------end--------------->8--- that would be put in (gnu system image). Otherwise, looks fine to me :) Thanks again, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 31 08:12:35 2020 Received: (at 43101) by debbugs.gnu.org; 31 Aug 2020 12:12:35 +0000 Received: from localhost ([127.0.0.1]:51777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCifr-0004pE-9Z for submit@debbugs.gnu.org; Mon, 31 Aug 2020 08:12:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCifo-0004ow-QA for 43101@debbugs.gnu.org; Mon, 31 Aug 2020 08:12:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55111) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCifj-0000gK-Jz; Mon, 31 Aug 2020 08:12:27 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=36058 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kCifi-0007cr-HB; Mon, 31 Aug 2020 08:12:26 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Julien Lepiller Subject: Re: [bug#43101] [PATCH v2] Add version number in release ISO References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> <20200830215230.3dd526fd@tachikoma.lepiller.eu> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Fructidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 31 Aug 2020 14:12:25 +0200 In-Reply-To: <20200830215230.3dd526fd@tachikoma.lepiller.eu> (Julien Lepiller's message of "Sun, 30 Aug 2020 21:52:30 +0200") Message-ID: <877dtfdnfa.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43101 Cc: Mathieu Othacehe , 43101@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: -3.3 (---) Hi! Julien Lepiller skribis: > From a502fa70b0230d3f91ddf05410f24a1f4fcad521 Mon Sep 17 00:00:00 2001 > From: Julien Lepiller > Date: Sat, 29 Aug 2020 15:34:56 +0200 > Subject: [PATCH 1/3] guix: system: Add `--label' option. > > * guix/scripts/system.scm (%options): Add `--label'. > (system-derivation-for-action): Take a #:label key to set volume ID. > (perform-action): Take a #:label key. > (%default-options): Add default label value. > (process-action): Pass label value from command-line to perform-action. > --- > doc/guix.texi | 4 +++- > guix/scripts/system.scm | 27 ++++++++++++++++++++++----- Please mention the doc/guix.texi changes as well in the log. :-) > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -28836,7 +28836,9 @@ the @option{--image-size} option is ignored in th= e case of > @code{docker-image}. >=20=20 > You can specify the root file system type by using the > -@option{--file-system-type} option. It defaults to @code{ext4}. > +@option{--file-system-type} option. It defaults to @code{ext4}. When i= ts > +value is @code{iso9660}, the @option{--label} option can be used to spec= ify > +a volume ID with @code{disk-image}. Could you also add an @item for --label, just like we have for the other options? I=E2=80=99m also fine with what Mathieu suggests. OK for me with changes along these lines! Thank you, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 31 10:14:09 2020 Received: (at 43101-done) by debbugs.gnu.org; 31 Aug 2020 14:14:09 +0000 Received: from localhost ([127.0.0.1]:53255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCkZU-00089i-QM for submit@debbugs.gnu.org; Mon, 31 Aug 2020 10:14:08 -0400 Received: from lepiller.eu ([89.234.186.109]:47998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCkZO-00089L-VE for 43101-done@debbugs.gnu.org; Mon, 31 Aug 2020 10:14:07 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id aa8e4755 for <43101-done@debbugs.gnu.org>; Mon, 31 Aug 2020 14:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=9dlVWP0nARyx F4+11bRLnMDGO0c8dKs0W5zKNGAVrmk=; b=RyA+S5byvZFcxrenJm3INrFkEOqE Bqmozqrw8oSaSC4rKB0hE+ZpNKsxUCJkHrHm+PXlQGzzN/3+razmy7qplIoRMr3v WiN9BaHnv6SE0m3FeiXyCa7j9InLYWfPaW0hCLfN0/nH8B1dVbwOKjL7eHX6G3TT FmIo9nc+VOicMjY+Pftp53EAo+8ktDkaMI87Ni7bdQPu58HwGWu+JmYHBxvri4l/ Qr7zLwSF6LtHrQMheYTdfF8ci53jwFmseUTct1E6M+2t4PkKevNt1Zh959LPj2d4 i9vRYTz9uFSAB+btyTuBEqMObHYvv8HrInZpk6ST6xetLnzB/dekUv7eXg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 7272100b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43101-done@debbugs.gnu.org>; Mon, 31 Aug 2020 14:14:00 +0000 (UTC) Date: Mon, 31 Aug 2020 16:13:46 +0200 From: Julien Lepiller To: 43101-done@debbugs.gnu.org Subject: Re: [bug#43101] [PATCH v2] Add version number in release ISO Message-ID: <20200831161346.5ed7ac86@tachikoma.lepiller.eu> In-Reply-To: <87r1rnibi3.fsf@gnu.org> References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> <20200830215230.3dd526fd@tachikoma.lepiller.eu> <87r1rnibi3.fsf@gnu.org> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43101-done 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 (-) Le Mon, 31 Aug 2020 08:18:44 +0200, Mathieu Othacehe a =C3=A9crit : > Hey Julien, >=20 > Thanks for the v2 :) >=20 > > (inherit iso9660-image) > > - (operating-system installation-os)))) > > + (operating-system installation-os) > > + (partitions (match (image-partitions > > iso9660-image) > > + ((boot others ...) > > + (cons > > + (partition > > + (inherit boot) > > + (label (string-append "GUIX_" > > system "_" > > + > > %guix-version))) > > + others))))))) =20 >=20 > We could maybe factorize this in something like: >=20 > --8<---------------cut here---------------start------------->8--- > (define (image-with-label image label) > ...) > --8<---------------cut here---------------end--------------->8--- >=20 > that would be put in (gnu system image). >=20 > Otherwise, looks fine to me :) >=20 > Thanks again, >=20 > Mathieu Pushed as 036f23f053ee6bd34c6d387debb4a9166561dd02 to 7b2ac4768721ccab1782daad99a7cb1be0ed01ee, thank you! From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 03 07:10:47 2020 Received: (at 43101) by debbugs.gnu.org; 3 Sep 2020 11:10:47 +0000 Received: from localhost ([127.0.0.1]:33637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDn8h-00087X-8D for submit@debbugs.gnu.org; Thu, 03 Sep 2020 07:10:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDn8d-00087K-Le for 43101@debbugs.gnu.org; Thu, 03 Sep 2020 07:10:45 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35039) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDn8X-00068T-0E; Thu, 03 Sep 2020 07:10:37 -0400 Received: from [2a01:e0a:19b:d9a0:9d9d:97cc:d92a:8ac0] (port=44118 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kDn8V-0006XG-BD; Thu, 03 Sep 2020 07:10:36 -0400 From: Mathieu Othacehe To: 43101@debbugs.gnu.org Subject: Re: bug#43101: [PATCH v2] Add version number in release ISO References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> <20200830215230.3dd526fd@tachikoma.lepiller.eu> <87r1rnibi3.fsf@gnu.org> <20200831161346.5ed7ac86@tachikoma.lepiller.eu> Date: Thu, 03 Sep 2020 13:10:34 +0200 In-Reply-To: <20200831161346.5ed7ac86@tachikoma.lepiller.eu> (Julien Lepiller's message of "Mon, 31 Aug 2020 16:13:46 +0200") Message-ID: <87a6y7dsk5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43101 Cc: julien@lepiller.eu 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: -3.3 (---) Hello Julien, > Pushed as 036f23f053ee6bd34c6d387debb4a9166561dd02 to > 7b2ac4768721ccab1782daad99a7cb1be0ed01ee, thank you! It seems that the new ISO labels are hitting a 32 characters limit, see: https://ci.guix.gnu.org/log/alcb138l3gk5hzb0s2idgbkx5kg9n1ja-iso9660-image. I would propose to truncate the commit hash to 7 characters. Could you have a look? Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 03 08:11:10 2020 Received: (at 43101) by debbugs.gnu.org; 3 Sep 2020 12:11:10 +0000 Received: from localhost ([127.0.0.1]:33862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDo58-0005YO-Ct for submit@debbugs.gnu.org; Thu, 03 Sep 2020 08:11:10 -0400 Received: from lepiller.eu ([89.234.186.109]:50558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kDo53-0005Y9-Iw for 43101@debbugs.gnu.org; Thu, 03 Sep 2020 08:11:09 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id c306ba5a; Thu, 3 Sep 2020 12:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=4ejy3XoSyIus pJ4Ru5yXZl4CcjeWtU+SCLpQXVGY0Ws=; b=ce/crOzSLi6s/ZmqkCgjR3JANLB2 WuD/Ssti3qxOs1K7LTXgi+KXkUQmTytl6taUjQY8iQXlFfiIOL5SXtit6xz7T/r2 9I8LHBVCj9e5OO2lvdjEI6X631JTg/4u6Hl9f76oShU+9Yq0a4eRYBlhyhkOPtWV HYYJR4f/9xhKH+fKZGV6+YpKhdC1G24bl9lB/MpdNhgcIwC+jVe/UnRZedEgfsib ZDYGAWY0DrA/iolWqBxsAcdTXb8BG8yoxmDx8cLFqJLc6GPAfjnmXCYAZ287BMxz qryYKjahe7jsRrSkKfBCQefV4C+O2SazQ+Lv1ne/ixxIexFs/xdcgOy4Lw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ca6a7599 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 3 Sep 2020 12:11:02 +0000 (UTC) Date: Thu, 3 Sep 2020 14:10:53 +0200 From: Julien Lepiller To: Mathieu Othacehe Subject: Re: bug#43101: [PATCH v2] Add version number in release ISO Message-ID: <20200903141053.010f2ce1@tachikoma.lepiller.eu> In-Reply-To: <87a6y7dsk5.fsf@gnu.org> References: <20200829154445.5512d99a@tachikoma.lepiller.eu> <87d038i6uf.fsf@gnu.org> <904ADAD9-76B7-4C7F-A0DF-39CEB6E3477D@lepiller.eu> <87v9h0p420.fsf@gnu.org> <20200830215230.3dd526fd@tachikoma.lepiller.eu> <87r1rnibi3.fsf@gnu.org> <20200831161346.5ed7ac86@tachikoma.lepiller.eu> <87a6y7dsk5.fsf@gnu.org> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43101 Cc: 43101@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 (-) Le Thu, 03 Sep 2020 13:10:34 +0200, Mathieu Othacehe a =C3=A9crit : > Hello Julien, >=20 > > Pushed as 036f23f053ee6bd34c6d387debb4a9166561dd02 to > > 7b2ac4768721ccab1782daad99a7cb1be0ed01ee, thank you! =20 >=20 > It seems that the new ISO labels are hitting a 32 characters limit, > see: > https://ci.guix.gnu.org/log/alcb138l3gk5hzb0s2idgbkx5kg9n1ja-iso9660-imag= e. >=20 > I would propose to truncate the commit hash to 7 characters. Could you > have a look? >=20 > Thanks, >=20 > Mathieu Thanks for the heads up, I pushed another commit to reduce the number of characters as 7596ae1034a6878ecbe9e65a642a1434a78b1cf0 From unknown Fri Jun 20 19:57:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 02 Oct 2020 11:24:04 +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