diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
| commit | 37da4fbe1562583589eeddb4be8e11bece80fd35 (patch) | |
| tree | 4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /Makefile.am | |
| parent | 73326e742d82b6706333885eca770f7518636b1f (diff) | |
| parent | e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff) | |
| download | patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar patches-37da4fbe1562583589eeddb4be8e11bece80fd35.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8d523262cb..99d6ed64b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -684,6 +684,9 @@ GUIX_SYSTEM_IMAGE_BASE = guix-system-install-$(PACKAGE_VERSION) # Prefix of the Guix VM image file name. GUIX_SYSTEM_VM_IMAGE_BASE = guix-system-vm-image-$(PACKAGE_VERSION) +# Return the sequence of '-s' flags for the given systems. +system_flags = $(foreach system,$(1),-s $(system)) + # The release process works in several phases: # # 0. We assume the developer created a 'vX.Y' tag. @@ -701,6 +704,7 @@ GUIX_SYSTEM_VM_IMAGE_BASE = guix-system-vm-image-$(PACKAGE_VERSION) # issue described at <https://savannah.gnu.org/bugs/index.php?51027>. release: dist cd po; git checkout . + cd doc; git checkout . @if ! git diff-index --quiet HEAD; then \ echo "There are uncommitted changes; stopping." >&2 ; \ exit 1 ; \ @@ -713,6 +717,9 @@ 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 \ + $(call system_flags,$(SUPPORTED_SYSTEMS)) \ + -v1 --no-grafts -K rm -f $(BINARY_TARBALLS) $(MAKE) $(BINARY_TARBALLS) for system in $(SUPPORTED_SYSTEMS) ; do \ @@ -724,6 +731,9 @@ release: dist "`git rev-parse HEAD`" git add $(top_srcdir)/gnu/packages/package-management.scm 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 for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ |