[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/17: system: grub: On MIPS, the linux image name is vmlinuz, not bzIma
From: |
Mark H. Weaver |
Subject: |
01/17: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage. |
Date: |
Fri, 28 Aug 2015 15:56:03 +0000 |
mhw pushed a commit to branch wip-loongson2f
in repository guix.
commit afb0728b24aad615f07f9d51a61143f02b2eac49
Author: Mark H Weaver <address@hidden>
Date: Wed Aug 19 16:30:02 2015 -0400
system: grub: On MIPS, the linux image name is vmlinuz, not bzImage.
* gnu/system/grub.scm (grub-configuration-file): Add 'linux-image-name'
internal procedure. Use it from 'entry->gexp'.
---
gnu/system/grub.scm | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index e49b6db..7f85adf 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -206,6 +206,11 @@ fi~%"
"Return the GRUB configuration file corresponding to CONFIG, a
<grub-configuration> object. OLD-ENTRIES is taken to be a list of menu
entries corresponding to old generations of the system."
+ (define linux-image-name
+ (if (string-prefix? "mips" system)
+ "vmlinuz"
+ "bzImage"))
+
(define all-entries
(append entries (grub-configuration-menu-entries config)))
@@ -214,13 +219,14 @@ entries corresponding to old generations of the system."
(($ <menu-entry> label linux arguments initrd)
#~(format port "menuentry ~s {
# Set 'root' to the partition that contains the kernel.
- search --file --set ~a/bzImage~%
+ search --file --set ~a/~a~%
- linux ~a/bzImage ~a
+ linux ~a/~a ~a
initrd ~a
}~%"
#$label
- #$linux #$linux (string-join (list address@hidden))
+ #$linux #$linux-image-name
+ #$linux #$linux-image-name (string-join (list address@hidden))
#$initrd))))
(mlet %store-monad ((sugar (eye-candy config #~port)))
- branch wip-loongson2f created (now d6c78a5), Mark H. Weaver, 2015/08/28
- 04/17: gnu: linux-libre: Add 'supported-systems' field: Intel only for now., Mark H. Weaver, 2015/08/28
- 03/17: linux-initrd: Use pata_acpi, pata_atiixp, and isci modules only on Intel., Mark H. Weaver, 2015/08/28
- 08/17: gnu: grub: Use modify-phases and other minor cleanups., Mark H. Weaver, 2015/08/28
- 01/17: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage.,
Mark H. Weaver <=
- 09/17: gnu: grub: Install documentation., Mark H. Weaver, 2015/08/28
- 06/17: gnu: linux-libre: On MIPS, the linux image name is vmlinuz, not bzImage., Mark H. Weaver, 2015/08/28
- 02/17: system: grub: Adjust eye-candy to work on non-Intel systems., Mark H. Weaver, 2015/08/28
- 12/17: TEMPORARY_HACK: gnu: qemu: Disable tests on MIPS., Mark H. Weaver, 2015/08/28
- 10/17: gnu: grub: Update to 2.02-beta2-500-gba218c1., Mark H. Weaver, 2015/08/28
- 05/17: gnu: linux-libre: Add case for ARCH=mips., Mark H. Weaver, 2015/08/28
- 16/17: NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel., Mark H. Weaver, 2015/08/28
- 14/17: PRELIMINARY: system: grub: Convert grub background using rsvg-convert, not inkscape., Mark H. Weaver, 2015/08/28
- 11/17: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2015/08/28
- 15/17: PRELIMINARY: Attempts to get VMs working on MIPS., Mark H. Weaver, 2015/08/28