Patchwork Guix on a Dell XPS 13 DE - 9350

login
register
mail settings
Submitter Jan Nieuwenhuizen
Date July 2, 2016, 10:52 a.m.
Message ID <87vb0onwh2.fsf@gnu.org>
Download mbox | patch
Permalink /patch/13577/
State New
Headers show

Comments

Jan Nieuwenhuizen - July 2, 2016, 10:52 a.m.
Ludovic Courtès writes:

> It fails to build here:
>
> starting phase `check'
> make: *** No rule to make target 'check'.  Stop.
> phase `check' failed after 0.0 seconds

Here also.  Weird.  Added

     `(#:test-target "test"

>> +    (license gpl2)))
>
> Version 2 only?

Yes, double checked.

> Could you send an updated patch?

Sure, find attached.

>> * gnu/system/linux-initrd.scm (base-initrd): Add nvme to linux-modules.
>
> Applied!

Thanks!

>> From 37ab729322b21acd325b43c97b47c8e217635cd1 Mon Sep 17 00:00:00 2001
>> From: Jan Nieuwenhuizen <janneke@gnu.org>
>> Date: Fri, 17 Jun 2016 13:45:28 +0200
>> Subject: [PATCH 3/4] nix: Allow ~ in store names.
>>
>> * nix/libstore/store-api.cc (checkStoreName): Add ~ to validChars.
>
> Nack!  :-)  This looks like a can of worms, so I’d rather change the GRUB
> version name.

Fine! :-)

>>      (name "grub")
>> -    (version "2.00")
>> +    (version "2.02~beta3")
>
> Could you make it “2.02beta3”?

Okay...

>>      (source (origin
>>               (method url-fetch)
>> -             (uri (string-append "mirror://gnu/grub/grub-"
>> -                                 version ".tar.xz"))
>> +             (uri (string-append
>> +                   "ftp://alpha.gnu.org/gnu/grub/grub-"
>> +                   version ".tar.xz"))

> Likewise, add a ‘file-name’ here to avoid “~”.

Ah, that's what I've been missing.  Thanks!

>>      (arguments
>>       '(#:configure-flags '("--disable-werror")
>> +       #:tests? #f ;; fail
>
> That’s cheating.  :-)
>
> Could you explain why/how it fails?  I would rather address it or at
> least make sure we have a good understanding of what’s going on.

Added

+     '(;; two warnings: suggest braces, signed/unsigned comparison
+       #:configure-flags '("--disable-werror")

these seem harmless...

and this one test

+                     ;; fails
+                     (substitute* "tests/grub_func_test.in"
+                       (("set -e") "exit 77\nset -e")))))))

fails, I haven't looked into whether it's a new test or what it does or
why it may fail.

Greetings,
Jan
Ludovic Courtès - July 13, 2016, 10:06 p.m.
Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> From aa977fad90feb68ecafbfdb377734d91e4203856 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 23:58:45 +0200
> Subject: [PATCH 1/2] gnu: Add gptfdisk.
>
> * gnu/packages/disk.scm (gptfdisk): New variable.

Pushed.

> From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 09:50:27 +0200
> Subject: [PATCH 2/2] gnu: Update grub to 2.02~beta3.
>
> * gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
> custom url symlinked to 2.02~beta3.

Pushed also.

I tested with “make check-system TESTS=installed-os” that it yields a
bootable system.  I’ll check on the bare metal soonish.

> +                     ;; fails
> +                     (substitute* "tests/grub_func_test.in"
> +                       (("set -e") "exit 77\nset -e")))))))

I’ve reported this issue at
<https://lists.gnu.org/archive/html/grub-devel/2016-07/msg00026.html>.

Thanks!

Ludo’.
Ludovic Courtès - July 15, 2016, 3:06 p.m.
ludo@gnu.org (Ludovic Courtès) skribis:

> Jan Nieuwenhuizen <janneke@gnu.org> skribis:

[...]

>> From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
>> From: Jan Nieuwenhuizen <janneke@gnu.org>
>> Date: Thu, 16 Jun 2016 09:50:27 +0200
>> Subject: [PATCH 2/2] gnu: Update grub to 2.02~beta3.
>>
>> * gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
>> custom url symlinked to 2.02~beta3.
>
> Pushed also.
>
> I tested with “make check-system TESTS=installed-os” that it yields a
> bootable system.  I’ll check on the bare metal soonish.

I can now confirm that it works fine on the bare metal too.  :-)

Ludo’.

Patch

From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 16 Jun 2016 09:50:27 +0200
Subject: [PATCH 2/2] gnu: Update grub to 2.02~beta3.

* gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
custom url symlinked to 2.02~beta3.
---
 gnu/packages/grub.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 31b270c..d1799d7 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,20 +77,21 @@ 
 (define-public grub
   (package
     (name "grub")
-    (version "2.00")
+    (version "2.02beta3")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://gnu/grub/grub-"
-                                 version ".tar.xz"))
+             (uri (string-append
+                   "ftp://alpha.gnu.org/gnu/grub/grub-"
+                   "2.02~beta3"
+                   ".tar.xz"))
+             (file-name (string-append name "-" version ".tar.xz"))
              (sha256
               (base32
-               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
-             (patches (search-patches "grub-gets-undeclared.patch"
-                                      "grub-freetype.patch"
-                                      "grub-CVE-2015-8370.patch"))))
+               "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-werror")
+     '(;; two warnings: suggest braces, signed/unsigned comparison
+       #:configure-flags '("--disable-werror")
        #:phases (modify-phases %standard-phases
                   (add-after
                    'unpack 'patch-stuff
@@ -100,7 +102,9 @@ 
                      ;; Make the font visible.
                      (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
                      (system* "gunzip" "unifont.bdf.gz")
-                     #t)))))
+                     ;; fails
+                     (substitute* "tests/grub_func_test.in"
+                       (("set -e") "exit 77\nset -e")))))))
     (inputs
      `(;; ("lvm2" ,lvm2)
        ("gettext" ,gnu-gettext)
-- 
2.8.4