ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: grub: Update to 2.02~beta3.

Browse source 
* gnu/packages/grub.scm (grub): Update to 2.02~beta3.
[arguments]: Modify tests/grub_func_test.in in 'patch-stuff' phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jan Nieuwenhuizen 2016-06-16 09:50:27 +02:00 committed by Ludovic Courtès
parent 66f8f5f9c3
commit 4c7260011e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/grub.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -76,20 +77,21 @@ (define unifont
(define-public grub (define-public grub
(package (package
(name "grub") (name "grub")
(version "2.00") (version "2.02beta3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/grub/grub-" (uri (string-append
version ".tar.xz")) "ftp://alpha.gnu.org/gnu/grub/grub-"
"2.02~beta3"
".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq")) "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))
(patches (search-patches "grub-gets-undeclared.patch"
"grub-freetype.patch"
"grub-CVE-2015-8370.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-werror") '(;; Two warnings: suggest braces, signed/unsigned comparison.
#:configure-flags '("--disable-werror")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after (add-after
'unpack 'patch-stuff 'unpack 'patch-stuff
@ -100,6 +102,13 @@ (define-public grub
;; Make the font visible. ;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz")
;; We hit an assertion failure in
;; grub-core/tests/video_checksum.c, as reported at
;; <https://lists.gnu.org/archive/html/grub-devel/2016-07/msg00026.html>.
;; Disable this test for now.
(substitute* "tests/grub_func_test.in"
(("set -e") "exit 77\nset -e"))
#t))))) #t)))))
(inputs (inputs
`(;; ("lvm2" ,lvm2) `(;; ("lvm2" ,lvm2)