ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

maint: Use a pretty version string in ISO and VM images.

Browse source 
* gnu/system/examples/vm-image.tmpl: Use the 'GUIX_DISPLAYED_VERSION'
environment variable in 'label'.
* gnu/system/install.scm (%installation-os): Likewise.
* Makefile.am (release): Set 'GUIX_DISPLAYED_VERSION'.
This commit is contained in:
Ludovic Courtès 2022-08-09 11:48:52 +02:00
parent 95a03aa5c5
commit fdafd40432
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -984,13 +984,14 @@ release: dist-with-updated-version all
-v1 --no-grafts --fallback -v1 --no-grafts --fallback
# Generate the ISO installation images. # Generate the ISO installation images.
for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \
GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system image -t iso9660 \ guix system image -t iso9660 \
--label="GUIX_$${system}_$(VERSION)" \ --label="GUIX_$${system}_$(VERSION)" \
--system=$$system --fallback \ --system=$$system --fallback \
gnu/system/install.scm` ; \ gnu/system/install.scm` ; \
if [ ! -f "$$image" ] ; then \ if [ ! -f "$$image" ] ; then \
echo "failed to produce Guix installation image for $$system" >&2 ; \ echo "failed to produce Guix installation image for $$system" >&2 ; \
exit 1 ; \ exit 1 ; \
fi ; \ fi ; \
cp "$$image" "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.tmp" ; \ cp "$$image" "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.tmp" ; \
@ -999,6 +1000,7 @@ release: dist-with-updated-version all
done done
# Generate the VM images. # Generate the VM images.
for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \
GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ; \
image=`$(top_builddir)/pre-inst-env \ image=`$(top_builddir)/pre-inst-env \
guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
--save-provenance \ --save-provenance \

4
gnu/system/examples/vm-image.tmpl
View file

@ -43,7 +43,9 @@ accounts.\x1b[0m
(keyboard-layout (keyboard-layout "us" "altgr-intl")) (keyboard-layout (keyboard-layout "us" "altgr-intl"))
;; Label for the GRUB boot menu. ;; Label for the GRUB boot menu.
(label (string-append "GNU Guix " (package-version guix))) (label (string-append "GNU Guix "
(or (getenv "GUIX_DISPLAYED_VERSION")
(package-version guix))))
(firmware '()) (firmware '())

3
gnu/system/install.scm
View file

@ -469,7 +469,8 @@ (define installation-os
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sda")))) (targets '("/dev/sda"))))
(label (string-append "GNU Guix installation " (label (string-append "GNU Guix installation "
(package-version guix))) (or (getenv "GUIX_DISPLAYED_VERSION")
(package-version guix))))
;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon
;; non-functional: ;; non-functional: