[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/28: system: 'system-linux-image-file-name' takes an optional paramete
From: |
guix-commits |
Subject: |
01/28: system: 'system-linux-image-file-name' takes an optional parameter. |
Date: |
Sat, 30 May 2020 11:20:11 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 113ba9d7a989508a8f9b30bd25cd3977c255824d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 27 17:40:14 2020 +0200
system: 'system-linux-image-file-name' takes an optional parameter.
* gnu/system.scm (system-linux-image-file-name): Make 'target' an
optional parameter.
---
gnu/system.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index ac8bbd1..61cbaef 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -466,15 +466,15 @@ from the initrd."
"Return the list of swap services for OS."
(map swap-service (operating-system-swap-devices os)))
-(define* (system-linux-image-file-name)
- "Return the basename of the kernel image file for SYSTEM."
- ;; FIXME: Evaluate the conditional based on the actual current system.
- (let ((target (or (%current-target-system) (%current-system))))
- (cond
- ((string-prefix? "arm" target) "zImage")
- ((string-prefix? "mips" target) "vmlinuz")
- ((string-prefix? "aarch64" target) "Image")
- (else "bzImage"))))
+(define* (system-linux-image-file-name #:optional
+ (target (or (%current-target-system)
+ (%current-system))))
+ "Return the basename of the kernel image file for TARGET."
+ (cond
+ ((string-prefix? "arm" target) "zImage")
+ ((string-prefix? "mips" target) "vmlinuz")
+ ((string-prefix? "aarch64" target) "Image")
+ (else "bzImage")))
(define (operating-system-kernel-file os)
"Return an object representing the absolute file name of the kernel image of
- branch wip-hurd-vm created (now b73d83f), guix-commits, 2020/05/30
- 03/28: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/30
- 05/28: vm: <virtual-machine> compiler honors system and target., guix-commits, 2020/05/30
- 08/28: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/30
- 14/28: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/30
- 01/28: system: 'system-linux-image-file-name' takes an optional parameter.,
guix-commits <=
- 04/28: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/30
- 02/28: vm: 'expression->derivation-in-linux-vm' always returns a native build., guix-commits, 2020/05/30
- 07/28: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/30
- 09/28: image: Add Hurd support., guix-commits, 2020/05/30
- 06/28: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/30
- 10/28: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/30
- 11/28: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/30
- 12/28: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/30
- 15/28: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/30
- 18/28: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/30