projects/guix·commit 020184fd

maint: Adjust sed script from 'release' target.

020184fd · Ludovic Courtès <[email protected]> · 2022-11-30 17:46:50 +01:00

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

* Makefile.am (release): Remove '/v' from sed script for
GUIX_DISPLAYED_VERSION.
Commit
020184fd39c6244e0336db3c608d3946b8d20490
Parents
1aa7ee52

Changes

1 files changed · +2 −2

FileStatusAddDelContent
Makefile.ammodified+2−2View file

Makefile.am

View file
diff --git a/Makefile.am b/Makefile.am
index 8aa3fe9..f410af4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1002,7 +1002,7 @@ release: dist-with-updated-version all
-v1 --no-grafts --fallback
# Generate the ISO installation images.
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 \
guix system image -t iso9660 \
--label="GUIX_$${system}_$(VERSION)" \
@@ -1018,7 +1018,7 @@ release: dist-with-updated-version all
done
# Generate the VM images.
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 \
guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \
--save-provenance \