From a363e430d6f6c84190c05ffdfd5346c5b997537f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 27 Apr 2021 17:53:43 +0200 Subject: maint: Don't require 'bootstrap-tarballs' for powerpc64le-linux. * etc/release-manifest.scm (%base-manifest): Special-case "powerpc64le-linux". --- etc/release-manifest.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'etc/release-manifest.scm') diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index a1f731a945..ffc3b16f0a 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -100,9 +100,14 @@ TARGET." (manifest (append-map (lambda (system) (map (cut package->manifest-entry* <> system) - (if (string=? system "i586-gnu") - %base-packages/hurd - %base-packages))) + (cond ((string=? system "i586-gnu") + %base-packages/hurd) + ((string=? system "powerpc64le-linux") + ;; FIXME: Drop 'bootstrap-tarballs' until + ;; is fixed. + (drop %base-packages 1)) + (else + %base-packages)))) %cuirass-supported-systems))) (define %system-manifest -- cgit v1.2.3 From 42ac8da474ff71fcbbfc6569a3a7e6f7e6e123e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 27 Apr 2021 22:22:15 +0200 Subject: 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(+) (limited to 'etc/release-manifest.scm') 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. -- cgit v1.2.3