[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: maint: Adjust sed script from 'release' target.
From: |
guix-commits |
Subject: |
02/02: maint: Adjust sed script from 'release' target. |
Date: |
Wed, 30 Nov 2022 14:03:14 -0500 (EST) |
civodul pushed a commit to branch version-1.4.0
in repository guix.
commit 020184fd39c6244e0336db3c608d3946b8d20490
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Nov 30 17:46:50 2022 +0100
maint: Adjust sed script from 'release' target.
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.
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8aa3fe9cec..f410af4094 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
\