From 808084e9d1ba7d78621bf4c441c7ddb616849683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2020 11:31:42 +0200 Subject: 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(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 344ecdbc42..94348ff00d 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) -- cgit v1.2.3 From 8b292ffd3cd969286ee9cbdb70fde8cf384b9b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2020 13:17:06 +0200 Subject: maint: 'release' target no longer uses -K, to allow for offloading. This is a followup to 2ce08a5d79f6eb1d2d3839aca859559b9829ae36. * Makefile.am (release): Remove -K flag. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 94348ff00d..e9b84d8e4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -775,7 +775,7 @@ release: dist git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ $(call system_flags,$(SUPPORTED_SYSTEMS)) \ - -v1 --no-grafts -K + -v1 --no-grafts rm -f $(BINARY_TARBALLS) $(MAKE) $(BINARY_TARBALLS) for system in $(SUPPORTED_SYSTEMS) ; do \ @@ -789,7 +789,7 @@ release: dist git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." $(top_builddir)/pre-inst-env guix build guix \ $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ - -v1 --no-grafts -K + -v1 --no-grafts for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ -- cgit v1.2.3 From 98148830c0afb9adc8acf150afc48f09aae42ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2020 16:31:45 +0200 Subject: maint: 'release' builds with '--fallback'. * Makefile.am (guix-binary.%.tar.xz): Pass '--fallback' to 'guix pack'. (release): Pass '--fallback' to 'guix build' and 'guix system'. --- Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index e9b84d8e4e..654734a991 100644 --- a/Makefile.am +++ b/Makefile.am @@ -669,6 +669,7 @@ GUIX_FOR_BINARY_TARBALL = guile3.0-guix guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ + --fallback \ -s "$*" --localstatedir --profile-name=current-guix \ $(GUIX_FOR_BINARY_TARBALL)` ; \ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" @@ -775,7 +776,7 @@ release: dist git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ $(call system_flags,$(SUPPORTED_SYSTEMS)) \ - -v1 --no-grafts + -v1 --no-grafts --fallback rm -f $(BINARY_TARBALLS) $(MAKE) $(BINARY_TARBALLS) for system in $(SUPPORTED_SYSTEMS) ; do \ @@ -789,12 +790,12 @@ release: dist git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." $(top_builddir)/pre-inst-env guix build guix \ $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS)) \ - -v1 --no-grafts + -v1 --no-grafts --fallback for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ --file-system-type=iso9660 \ - --system=$$system \ + --system=$$system --fallback \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ echo "failed to produced Guix installation image for $$system" >&2 ; \ @@ -807,7 +808,7 @@ release: dist for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ - --system=$$system \ + --system=$$system --fallback \ gnu/system/examples/vm-image.tmpl` ; \ if [ ! -f "$$image" ] ; then \ echo "failed to produced Guix VM image for $$system" >&2 ; \ -- cgit v1.2.3 From 08b14ab20ebe181690df6210a0b3f95bad494af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Apr 2020 12:26:21 +0200 Subject: maint: 'release' targets runs ./bootstrap for new version string. Reported by Vagrant Cascadian . * Makefile.am (dist-with-updated-version): New target. (release): Depend on 'dist-with-updated-version'. --- Makefile.am | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 654734a991..36f23b4062 100644 --- a/Makefile.am +++ b/Makefile.am @@ -705,6 +705,16 @@ gen-AUTHORS: "$(top_srcdir)" "$(distdir)/AUTHORS"; \ fi +# Like 'dist', but regenerate 'configure' so we get an up-to-date +# 'PACKAGE_VERSION' string. (In Gnulib, 'GNUmakefile' has a special trick to +# do that whenever a 'dist' target is used.) +dist-with-updated-version: + @echo "Running './bootstrap' for new version string..." + $(top_srcdir)/bootstrap + $(MAKE) $(AM_MAKEFLAGS) $(top_srcdir)/.version dist + +.PHONY: dist-with-updated-version + # # Release management. @@ -760,7 +770,7 @@ system_flags = $(foreach system,$(1),-s $(system)) # # XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext # issue described at . -release: dist +release: dist-with-updated-version cd po; git checkout . @if ! git diff-index --quiet HEAD; then \ echo "There are uncommitted changes; stopping." >&2 ; \ -- cgit v1.2.3