[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: linux-initrd: Silence Guile warnings.
From: |
guix-commits |
Subject: |
06/07: linux-initrd: Silence Guile warnings. |
Date: |
Fri, 15 May 2020 18:34:53 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 12adffd43efe381e9d634d01242ba1988c65ce5c
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri May 15 22:34:14 2020 +0200
linux-initrd: Silence Guile warnings.
Previously, since the switch to Guile 3, we'd see this warning repeated
several times at boot time:
WARNING: …: imported module (guix build utils) overrides core binding
`delete'
* gnu/system/linux-initrd.scm (raw-initrd): In gexp, #:hide 'delete'
from (guix build utils). Wrap 'boot-system' in 'parameterize'.
---
gnu/system/linux-initrd.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index c43d53a..0971ec2 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2017, 2019 Mathieu Othacehe <address@hidden>
@@ -197,7 +197,7 @@ upon error."
#~(begin
(use-modules (gnu build linux-boot)
(gnu system file-systems)
- (guix build utils)
+ ((guix build utils) #:hide (delete))
(guix build bournish) ;add the 'bournish' meta-command
(srfi srfi-26)
@@ -213,18 +213,19 @@ upon error."
(set-path-environment-variable "PATH" '("bin" "sbin")
'#$helper-packages)))
- (boot-system #:mounts
- (map spec->file-system
- '#$(map file-system->spec file-systems))
- #:pre-mount (lambda ()
- (and #$@device-mapping-commands))
- #:linux-modules '#$linux-modules
- #:linux-module-directory '#$kodir
- #:keymap-file #+(and=> keyboard-layout
- keyboard-layout->console-keymap)
- #:qemu-guest-networking? #$qemu-networking?
- #:volatile-root? '#$volatile-root?
- #:on-error '#$on-error)))
+ (parameterize ((current-warning-port (%make-void-port "w")))
+ (boot-system #:mounts
+ (map spec->file-system
+ '#$(map file-system->spec file-systems))
+ #:pre-mount (lambda ()
+ (and #$@device-mapping-commands))
+ #:linux-modules '#$linux-modules
+ #:linux-module-directory '#$kodir
+ #:keymap-file #+(and=> keyboard-layout
+ keyboard-layout->console-keymap)
+ #:qemu-guest-networking? #$qemu-networking?
+ #:volatile-root? '#$volatile-root?
+ #:on-error '#$on-error))))
#:name "raw-initrd"))
(define* (file-system-packages file-systems #:key (volatile-root? #f))
- branch master updated (a7b2022 -> 408ae72), guix-commits, 2020/05/15
- 01/07: bootloader: grub: Refer to the native 'grub-mklayout' and font file., guix-commits, 2020/05/15
- 03/07: gexp: Add 'let-system'., guix-commits, 2020/05/15
- 04/07: utils: 'target-arm32?' & co. take an optional parameter., guix-commits, 2020/05/15
- 07/07: services: shepherd: Silence Guile warnings., guix-commits, 2020/05/15
- 06/07: linux-initrd: Silence Guile warnings.,
guix-commits <=
- 05/07: vm: Use 'let-system'., guix-commits, 2020/05/15
- 02/07: gexp: Compilers can now return lowerable objects., guix-commits, 2020/05/15