From 42ac8da474ff71fcbbfc6569a3a7e6f7e6e123e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Apr 2021 22:22:15 +0200 Subject: [PATCH] maint: Require "emacs-no-x" instead of "emacs" on armhf-linux. * etc/release-manifest.scm (%base-packages/armhf): New variable. (%base-manifest): Use it. --- etc/release-manifest.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index ffc3b16f0a..4375c9bf8b 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -49,6 +49,14 @@ TARGET." '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" "openssh" "emacs" "vim" "python" "guile" "guix"))) +(define %base-packages/armhf + ;; XXX: Relax requirements for armhf-linux for lack of enough build power. + (map (lambda (package) + (if (string=? (package-name package) "emacs") + (specification->package "emacs-no-x") + package)) + %base-packages)) + (define %base-packages/hurd ;; XXX: For now we are less demanding of "i586-gnu". (map specification->package @@ -102,6 +110,10 @@ TARGET." (map (cut package->manifest-entry* <> system) (cond ((string=? system "i586-gnu") %base-packages/hurd) + ((string=? system "armhf-linux") + ;; FIXME: Drop special case when ci.guix.gnu.org + ;; has more ARMv7 build power. + %base-packages/armhf) ((string=? system "powerpc64le-linux") ;; FIXME: Drop 'bootstrap-tarballs' until ;; is fixed.