[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/21: system: vm: Fix for cross-build to the Hurd.
From: |
guix-commits |
Subject: |
03/21: system: vm: Fix for cross-build to the Hurd. |
Date: |
Thu, 7 May 2020 12:31:09 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 9993015855cde4ccfc943e1db793acd0c1a26317
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat May 2 19:17:34 2020 +0200
system: vm: Fix for cross-build to the Hurd.
Using #$linux when cross-building to the Hurd will attempt to cross compile
the Linux kernel, which fails. This very cheap fix (only 3 $$$ exchanged
with +) might have avoided trying many failed workarounds, or
<civodul> "money for nothing, changed to plus"
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Use native linux,
initrd. Fixes cross-build to the Hurd.
---
gnu/system/vm.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4ea82cf..68e6cfc 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2018 Chris Marusich <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -222,10 +223,10 @@ substitutable."
(let* ((native-inputs
'#+(list qemu (canonical-package coreutils)))
- (linux (string-append #$linux "/"
- #$(system-linux-image-file-name)))
- (initrd #$initrd)
- (loader #$loader)
+ (linux (string-append #+linux "/"
+ #+(system-linux-image-file-name)))
+ (initrd #+initrd)
+ (loader #+loader)
(graphs '#$(match references-graphs
(((graph-files . _) ...) graph-files)
(_ #f)))
- branch wip-hurd-vm created (now ed48faf), guix-commits, 2020/05/07
- 01/21: syscalls: Add ioctl flags for the Hurd., guix-commits, 2020/05/07
- 02/21: gnu: glibc/hurd-headers: Cross-build fix for the Hurd., guix-commits, 2020/05/07
- 06/21: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/07
- 04/21: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/07
- 07/21: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/07
- 08/21: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/07
- 09/21: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/07
- 03/21: system: vm: Fix for cross-build to the Hurd.,
guix-commits <=
- 05/21: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/07
- 10/21: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/07
- 16/21: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/07
- 17/21: HACK services: hurd: Add dummy `loopback'., guix-commits, 2020/05/07
- 11/21: services: hurd: Add `hurd-etc-sevcice'., guix-commits, 2020/05/07
- 12/21: system: Add `hurd-activation'., guix-commits, 2020/05/07
- 13/21: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/07
- 14/21: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/07
- 15/21: services: Add `hurd-console-service-type'., guix-commits, 2020/05/07
- 18/21: WIP: gnu: services: Add `%hurd-bare-metal-service'., guix-commits, 2020/05/07