[PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Mark H Weaver]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Currently, we assume that the linux image name is "bzImage", but this
varies depending on platform.  On MIPS, the name is "vmlinuz".  This
modifies our 'grub-configuation-file' generation code to use "vmlinuz"
on MIPS.

      Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz --]
[-- Type: text/x-patch, Size: 1682 bytes --]

From a15b9a1eedd5b110b94e13f0fea17323aa1e160e Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 19 Aug 2015 16:30:02 -0400
Subject: [PATCH] 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 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index fe7400a..1378f5f 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -221,6 +221,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)))
 
@@ -229,13 +234,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 #$@arguments))
+                #$linux #$linux-image-name
+                #$linux #$linux-image-name (string-join (list #$@arguments))
                 #$initrd))))
 
   (mlet %store-monad ((sugar (eye-candy config #~port)))
-- 
2.5.0

Re: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> From a15b9a1eedd5b110b94e13f0fea17323aa1e160e Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Wed, 19 Aug 2015 16:30:02 -0400
> Subject: [PATCH] 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'.

LGTM, thanks!

Ludo’.

Re: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Ludovic Courtès]

I just pushed this and two other non-controversial patches from
‘wip-loongson2f’.

I could continue, because the remainder looks OK too at first glance
(mostly I need to test that the new GRUB works fine here), but I thought
I’d leave you a chance to chime in.  ;-)

So the backlog currently is this:

+ 8692ab8 TEMPORARY_HACK: gnu: gst-plugins-base: Disable tests on MIPS and ARM.
+ 8549720 NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel.
+ 7380191 gnu: grub: Add support for Loongson-based machines.
+ 139588b gnu: grub: Update to 2.02-beta2-502-gc93d3e6.
+ fd70853 gnu: grub: Install documentation.
+ cde6189 gnu: grub: Use modify-phases and other minor cleanups.
+ 4f17937 gnu: Add linux-libre-loongson2f.
+ 61e8280 doc: Add texinfo to the requirements when building from git.
+ 5a45f27 gnu: linux-libre: On MIPS, the linux image name is vmlinuz, not bzImage.
+ 4cb1515 gnu: linux-libre: Add case for ARCH=mips.
+ 4917d6a gnu: linux-libre: Add 'supported-systems' field: Intel only for now.

Ludo’.

Re: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> I just pushed this and two other non-controversial patches from
> ‘wip-loongson2f’.

Sounds good, thanks!

> I could continue, because the remainder looks OK too at first glance
> (mostly I need to test that the new GRUB works fine here), but I thought
> I’d leave you a chance to chime in.  ;-)
>
> So the backlog currently is this:
>
> + 8692ab8 TEMPORARY_HACK: gnu: gst-plugins-base: Disable tests on MIPS and ARM.
> + 8549720 NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel.
> + 7380191 gnu: grub: Add support for Loongson-based machines.

FYI, the commit "7380191 gnu: grub: Add support for Loongson-based
machines" contains a mistake that shows itself on non-MIPS machines: the
quote in the following line should be quasiquote:

  '(("qemu" ,qemu-for-tests)

I fixed it in my local tree but haven't yet pushed it.

     Mark

Re: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:

[...]

>> + 8692ab8 TEMPORARY_HACK: gnu: gst-plugins-base: Disable tests on MIPS and ARM.
>> + 8549720 NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel.
>> + 7380191 gnu: grub: Add support for Loongson-based machines.
>
> FYI, the commit "7380191 gnu: grub: Add support for Loongson-based
> machines" contains a mistake that shows itself on non-MIPS machines: the
> quote in the following line should be quasiquote:
>
>   '(("qemu" ,qemu-for-tests)
>
> I fixed it in my local tree but haven't yet pushed it.

Noted.

Regarding linux-libre-loongson2f: Are the patches available elsewhere?
I figured we might as well refer to them using an ‘origin’ if there’s a
stable location we can use.

Thanks,
Ludo’.

Re: [PATCH] system: grub: On MIPS, the linux image name is vmlinuz

[Ludovic Courtès]

ludo@gnu.org (Ludovic Courtès) skribis:

> Regarding linux-libre-loongson2f: Are the patches available elsewhere?
> I figured we might as well refer to them using an ‘origin’ if there’s a
> stable location we can use.

Another issue: I changed the GRUB upgrade to use a more recent commit,
which includes the two MIPS patches that are used in wip-loongson2f.

However, GRUB fails one test on x86_64:

--8<---------------cut here---------------start------------->8---
FAIL: grub_func_test
====================

./grub_func_test: line 17: /gnu/store/mnwjrkbfzkb5ifhqf8hssf3cxfvg11l6-coreutils-8.24/bin/tail: Argument list too long
Functional test failure: shift_test:
shift_test: PASS

[...]

 tests/video_checksum.c:checksum:620: assert failed: 0 Checksum videotest_640x480xi16:1 failed: 0x1368a483 vs 0x7f1853ba
 tests/video_checksum.c:checksum:620: assert failed: 0 Checksum videotest_640x480xi16:0 failed: 0x1368a483 vs 0x7f1853ba
videotest_checksum: FAIL
--8<---------------cut here---------------end--------------->8---

The video test failure is a showstopper I think, and it would require
quite a bit of work to investigate.

Do you think you could help with these two things?  Otherwise we can
just postpone GuixSD/mips64el to the next release.

TIA,
Ludo’.