[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/15: gnu: grub: Use modify-phases and other minor cleanups.
From: |
Mark H. Weaver |
Subject: |
03/15: gnu: grub: Use modify-phases and other minor cleanups. |
Date: |
Thu, 20 Aug 2015 06:55:00 +0000 |
mhw pushed a commit to branch wip-loongson2f
in repository guix.
commit a3780694542721c52615a3018ef8519310c4852f
Author: Mark H Weaver <address@hidden>
Date: Sat Aug 15 01:22:06 2015 -0400
gnu: grub: Use modify-phases and other minor cleanups.
* gnu/packages/grub.scm (grub)[arguments]: Use modify-phases. Return #t
from
'patch-stuff' phase. Add 'patch-stuff' phase after 'unpack' instead of
before 'patch-source-shebangs'.
---
gnu/packages/grub.scm | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index b1da394..9fda08f 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -84,20 +85,22 @@
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-werror")
- #:phases (alist-cons-before
- 'patch-source-shebangs 'patch-stuff
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grub-core/Makefile.in"
- (("/bin/sh") (which "sh")))
+ #:phases (modify-phases %standard-phases
+ (add-after
+ 'unpack 'patch-stuff
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "grub-core/Makefile.in"
+ (("/bin/sh") (which "sh")))
- ;; Make the font visible.
- (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
- (system* "gunzip" "unifont.bdf.gz")
+ ;; Make the font visible.
+ (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
+ (system* "gunzip" "unifont.bdf.gz")
- ;; TODO: Re-enable this test when we have Parted.
- (substitute* "tests/partmap_test.in"
- (("set -e") "exit 77")))
- %standard-phases)))
+ ;; TODO: Re-enable this test when we have Parted.
+ (substitute* "tests/partmap_test.in"
+ (("set -e") "exit 77"))
+
+ #t)))))
(inputs
`(;; ("lvm2" ,lvm2)
("gettext" ,gnu-gettext)
- branch wip-loongson2f created (now efd15f9), Mark H. Weaver, 2015/08/20
- 08/15: system: grub: On MIPS, the linux image name is vmlinuz, not bzImage., Mark H. Weaver, 2015/08/20
- 01/15: gnu: linux-libre: Add case for ARCH=mips., Mark H. Weaver, 2015/08/20
- 05/15: gnu: grub: Update to 2.02-beta2-500-gba218c1., Mark H. Weaver, 2015/08/20
- 03/15: gnu: grub: Use modify-phases and other minor cleanups.,
Mark H. Weaver <=
- 02/15: gnu: Add linux-libre-loongson2f., Mark H. Weaver, 2015/08/20
- 06/15: gnu: grub: Install documentation., Mark H. Weaver, 2015/08/20
- 04/15: gnu: grub: Add comment noting that 'fuse' would be a desirable input., Mark H. Weaver, 2015/08/20
- 14/15: MIPS_ONLY: services: xorg: Remove several drivers (for Yeeloong)., Mark H. Weaver, 2015/08/20
- 13/15: MIPS_ONLY: Don't try to copy modules that don't exist in the loongson2f kernel., Mark H. Weaver, 2015/08/20
- 07/15: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2015/08/20
- 11/15: gnu: gst-plugins-base: Disable tests on MIPS and ARM., Mark H. Weaver, 2015/08/20
- 10/15: system: grub: Adjust eye-candy to work on non-Intel systems., Mark H. Weaver, 2015/08/20
- 15/15: MIPS_ONLY: file-systems: Remove hugetlb cgroup filesystem., Mark H. Weaver, 2015/08/20
- 12/15: PRELIMINARY: Fix problem with 'guix system init --nogrub'., Mark H. Weaver, 2015/08/20