[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: maint: Binary tarball uses "guile3.0-guix", not "guix".
From: |
guix-commits |
Subject: |
01/05: maint: Binary tarball uses "guile3.0-guix", not "guix". |
Date: |
Thu, 9 Apr 2020 16:57:52 -0400 (EDT) |
civodul pushed a commit to branch version-1.1.0
in repository guix.
commit 808084e9d1ba7d78621bf4c441c7ddb616849683
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Apr 9 11:31:42 2020 +0200
maint: Binary tarball uses "guile3.0-guix", not "guix".
* Makefile.am (GUIX_FOR_BINARY_TARBALL): New variable.
(guix-binary.%.tar.xz): Use $(GUIX_FOR_BINARY_TARBALL) instead of
"guix".
(release): Likewise.
---
Makefile.am | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 344ecdb..94348ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -662,11 +662,15 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-daemon \
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
+# Name of the 'guix' package shipped in the binary tarball.
+GUIX_FOR_BINARY_TARBALL = guile3.0-guix
+
# The self-contained tarball.
guix-binary.%.tar.xz:
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \
- -s "$*" --localstatedir --profile-name=current-guix guix` ; \
+ -s "$*" --localstatedir --profile-name=current-guix \
+ $(GUIX_FOR_BINARY_TARBALL)` ; \
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
@@ -769,7 +773,7 @@ release: dist
"`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
git add $(top_srcdir)/gnu/packages/package-management.scm
git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
- $(top_builddir)/pre-inst-env guix build guix \
+ $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL)
\
$(call system_flags,$(SUPPORTED_SYSTEMS)) \
-v1 --no-grafts -K
rm -f $(BINARY_TARBALLS)
- branch version-1.1.0 created (now f9adf35), guix-commits, 2020/04/09
- 01/05: maint: Binary tarball uses "guile3.0-guix", not "guix".,
guix-commits <=
- 03/05: maint: 'release' builds with '--fallback'., guix-commits, 2020/04/09
- 02/05: maint: 'release' target no longer uses -K, to allow for offloading., guix-commits, 2020/04/09
- 05/05: Update NEWS., guix-commits, 2020/04/09
- 04/05: gnu: qemu: Skip tests on i686-linux., guix-commits, 2020/04/09