[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable.
From: |
guix-commits |
Subject: |
02/09: Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable. |
Date: |
Fri, 30 Apr 2021 08:25:06 -0400 (EDT) |
apteryx pushed a commit to branch version-1.3.0
in repository guix.
commit c8b1799fd7c8d2f08c474d6f6761f40873a0fea1
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Apr 24 23:19:47 2021 -0400
Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable.
There is no use case where the Guix package is not named 'guix'.
* Makefile.am (GUIX_FOR_BINARY_TARBALL): Remove variable and replace its
uses
by 'guix'.
---
Makefile.am | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 04b4ed7..216f5b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -730,16 +730,13 @@ 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 = guix
-
# The self-contained tarball.
guix-binary.%.tar.xz:
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \
--fallback \
-s "$*" --localstatedir --profile-name=current-guix \
- $(GUIX_FOR_BINARY_TARBALL)` ; \
+ guix` ; \
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
@@ -857,7 +854,7 @@ release: dist-with-updated-version
"`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_FOR_BINARY_TARBALL)
\
+ $(top_builddir)/pre-inst-env guix build guix \
$(call system_flags,$(SUPPORTED_SYSTEMS)) \
-v1 --no-grafts --fallback
rm -f $(BINARY_TARBALLS)
- branch version-1.3.0 updated (68110f7 -> 9bf205e), guix-commits, 2021/04/30
- 02/09: Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable.,
guix-commits <=
- 05/09: build: Have the release target depend on 'all'., guix-commits, 2021/04/30
- 08/09: gnu: guix: Update to 1.3.0rc1., guix-commits, 2021/04/30
- 06/09: build: Build the guix.pot-update and contributing.pot-update targets only once., guix-commits, 2021/04/30
- 01/09: guix-install.sh: Ensure GUIX_BINARY_FILE_NAME is an absolute path., guix-commits, 2021/04/30
- 03/09: build: Update and add new comments for the release target., guix-commits, 2021/04/30
- 09/09: gnu: guix: Update to 6fd7f16., guix-commits, 2021/04/30
- 04/09: build: Add the qcow2 file extension to the VM image., guix-commits, 2021/04/30
- 07/09: build: Make doc-po-update and doc-pot-update targets idempotent., guix-commits, 2021/04/30