ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile.am: Remove the GUIX_FOR_BINARY_TARBALL variable.

Browse source 
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'.
This commit is contained in:
Maxim Cournoyer 2021-04-24 23:19:47 -04:00
parent 8214e70fa8
commit c8b1799fd7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -730,16 +730,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-daemon \ --enable-daemon \
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" 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. # The self-contained tarball.
guix-binary.%.tar.xz: guix-binary.%.tar.xz:
$(AM_V_GEN)GUIX_PACKAGE_PATH= \ $(AM_V_GEN)GUIX_PACKAGE_PATH= \
tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \
--fallback \ --fallback \
-s "$*" --localstatedir --profile-name=current-guix \ -s "$*" --localstatedir --profile-name=current-guix \
$(GUIX_FOR_BINARY_TARBALL)` ; \ guix` ; \
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
@ -857,7 +854,7 @@ release: dist-with-updated-version
"`git rev-parse HEAD`" "$(PACKAGE_VERSION)" "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
git add $(top_srcdir)/gnu/packages/package-management.scm git add $(top_srcdir)/gnu/packages/package-management.scm
git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." 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)) \ $(call system_flags,$(SUPPORTED_SYSTEMS)) \
-v1 --no-grafts --fallback -v1 --no-grafts --fallback
rm -f $(BINARY_TARBALLS) rm -f $(BINARY_TARBALLS)