me
/
guix
Archived
1
0
Fork 0

maint: Adjust sed script from 'release' target.

This is a followup to fdafd40432.  This
effect would to set 'GUIX_DISPLAYED_VERSION' to the empty string.

* Makefile.am (release): Remove '/v' from sed script for
GUIX_DISPLAYED_VERSION.
master
Ludovic Courtès 2022-11-30 17:46:50 +01:00
parent 1aa7ee52c6
commit 020184fd39
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions

View File

@ -1002,7 +1002,7 @@ 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'`" ; \ GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^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)" \
@ -1018,7 +1018,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'`" ; \ GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^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 \