[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: system: grub: On MIPS, the linux image name is vmlinuz, not bzIma
From: |
Mark H. Weaver |
Subject: |
01/14: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage. |
Date: |
Wed, 30 Sep 2015 22:13:16 +0000 |
mhw pushed a commit to branch wip-loongson2f
in repository guix.
commit b674d19d0d16deb8e77ff73e6be586c95ce0adab
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 8692ab8), Mark H. Weaver, 2015/10/08
- 01/14: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage.,
Mark H. Weaver <=
- 12/14: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2015/10/08
- 04/14: gnu: linux-libre: Add 'supported-systems' field: Intel only for now., Mark H. Weaver, 2015/10/08
- 13/14: NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel., Mark H. Weaver, 2015/10/08
- 05/14: gnu: linux-libre: Add case for ARCH=mips., Mark H. Weaver, 2015/10/08
- 06/14: gnu: linux-libre: On MIPS, the linux image name is vmlinuz, not bzImage., Mark H. Weaver, 2015/10/08
- 03/14: linux-initrd: Use pata_acpi, pata_atiixp, and isci modules only on Intel., Mark H. Weaver, 2015/10/08
- 09/14: gnu: grub: Use modify-phases and other minor cleanups., Mark H. Weaver, 2015/10/08
- 08/14: gnu: Add linux-libre-loongson2f., Mark H. Weaver, 2015/10/08
- 07/14: doc: Add texinfo to the requirements when building from git., Mark H. Weaver, 2015/10/08
- 02/14: system: grub: Adjust eye-candy to work on non-Intel systems., Mark H. Weaver, 2015/10/08