Use a released guix revision globally.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Acked-by: Adrien 'neox' Bourmault <neox@gnu.org>
This commit is contained in:
parent
a437a5f718
commit
ada459875c
27
configure.ac
27
configure.ac
|
@ -22,6 +22,26 @@ AC_CONFIG_FILES([
|
||||||
|
|
||||||
AC_SUBST([GUIX_BUILD_MAX_CORES], [])
|
AC_SUBST([GUIX_BUILD_MAX_CORES], [])
|
||||||
|
|
||||||
|
# When the Guix revision changes, the output changes, so we need to
|
||||||
|
# rebuild it. By not having the revision configurable through
|
||||||
|
# configure arguments, we make things easier because when the
|
||||||
|
# Makefiles are updated, things should be rebuilt anyway.
|
||||||
|
#
|
||||||
|
# In addition we currently use a released Guix revision and backport
|
||||||
|
# the changes we need from more recent Guix versions for several
|
||||||
|
# reasons:
|
||||||
|
#
|
||||||
|
# - Guix hosts the documentation of its latest release on its website,
|
||||||
|
# so by using the latest Guix release, we also enable GNU Boot
|
||||||
|
# contributors to have access to the corresponding Guix
|
||||||
|
# documentation without having to build and/or host it.
|
||||||
|
#
|
||||||
|
# - On most distributions, users don't need to run guix pull anymore
|
||||||
|
# to start downloading Guix 1.4.0 packages. So that can make things
|
||||||
|
# a lot faster.
|
||||||
|
|
||||||
|
AC_SUBST([GUIX_REVISION], [v1.4.0])
|
||||||
|
|
||||||
# --with-guix-build-max-cores
|
# --with-guix-build-max-cores
|
||||||
AC_ARG_WITH([guix-build-max-cores],
|
AC_ARG_WITH([guix-build-max-cores],
|
||||||
[AS_HELP_STRING([--with-guix-build-max-cores=N],
|
[AS_HELP_STRING([--with-guix-build-max-cores=N],
|
||||||
|
@ -36,6 +56,13 @@ AS_IF([test x"$FOUND_GUIX" = x""],
|
||||||
[AC_MSG_ERROR(
|
[AC_MSG_ERROR(
|
||||||
[guix was not found in PATH ($PATH)])])
|
[guix was not found in PATH ($PATH)])])
|
||||||
|
|
||||||
|
# Generate a config.sh file to enable script shell to retrieve some
|
||||||
|
# settings by sourcing it.
|
||||||
|
printf '#!/usr/bin/env bash\n' > config.sh
|
||||||
|
printf '# This file is generated by configure.ac\n' >> config.sh
|
||||||
|
printf 'GUIX_REVISION=%s\n' "$GUIX_REVISION" >> config.sh
|
||||||
|
chmod +x config.sh
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
AS_ECHO(["Configuration options:"])
|
AS_ECHO(["Configuration options:"])
|
||||||
|
|
|
@ -30,13 +30,13 @@ RELEASE_DIR = $(DESTDIR)/i945-thinkpads-install
|
||||||
# We enable caching by not making this configurable and so when the
|
# We enable caching by not making this configurable and so when the
|
||||||
# Makefile isn't updated, the Guix revision doesn't change, so we
|
# Makefile isn't updated, the Guix revision doesn't change, so we
|
||||||
# don't need to rebuild anything.
|
# don't need to rebuild anything.
|
||||||
GUIX_REVISION = v1.4.0
|
|
||||||
|
|
||||||
GUIX_PACK_COMMAND = \
|
GUIX_PACK_COMMAND = \
|
||||||
|
source $(TOPDIR)/config.sh && \
|
||||||
source resources/scripts/misc/guix.sh && \
|
source resources/scripts/misc/guix.sh && \
|
||||||
source_guix_profile && \
|
source_guix_profile && \
|
||||||
guix time-machine \
|
guix time-machine \
|
||||||
--commit=$(GUIX_REVISION) -- \
|
--commit="$${GUIX_REVISION}" -- \
|
||||||
pack \
|
pack \
|
||||||
-L $(TOPDIR)/resources/guix/ \
|
-L $(TOPDIR)/resources/guix/ \
|
||||||
-L $(TOPDIR)/resources/guix/gnuboot/patches/ \
|
-L $(TOPDIR)/resources/guix/gnuboot/patches/ \
|
||||||
|
@ -67,9 +67,10 @@ $(RELEASE_DIR)/gnuboot_src.tar: Makefile
|
||||||
$(RELEASE_DIR)/packages_src.tar: Makefile
|
$(RELEASE_DIR)/packages_src.tar: Makefile
|
||||||
install -d $(RELEASE_DIR)
|
install -d $(RELEASE_DIR)
|
||||||
tar cf $@ \
|
tar cf $@ \
|
||||||
`source resources/scripts/misc/guix.sh && \
|
`source $(TOPDIR)/config.sh && \
|
||||||
|
source resources/scripts/misc/guix.sh && \
|
||||||
source_guix_profile && \
|
source_guix_profile && \
|
||||||
guix time-machine --commit=$(GUIX_REVISION) -- \
|
guix time-machine --commit="$${GUIX_REVISION}" -- \
|
||||||
build \
|
build \
|
||||||
-c $(GUIX_BUILD_MAX_CORES) \
|
-c $(GUIX_BUILD_MAX_CORES) \
|
||||||
-L $(TOPDIR)/resources/guix/ \
|
-L $(TOPDIR)/resources/guix/ \
|
||||||
|
|
Loading…
Reference in New Issue