[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26341: [PATCH 5/5] build: Fix compilation warnings.
From: |
Mathieu Othacehe |
Subject: |
bug#26341: [PATCH 5/5] build: Fix compilation warnings. |
Date: |
Mon, 10 Apr 2017 19:18:14 +0200 |
* gnu/build/linux-boot.scm (define-module): Use (guix build syscalls).
* gnu/build/linux-modules.scm (define-module): Ditto.
* gnu/build/file-systems (define-module): Stop re-exporting mount, umount and
MS_* flags as this is now safe to include (guix build syscalls) instead.
(mount): Remove procedure.
(umount): Ditto.
---
gnu/build/file-systems.scm | 15 ++-------------
gnu/build/linux-boot.scm | 2 ++
gnu/build/linux-modules.scm | 2 ++
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index fe98df95d..eb9f07861 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2016, 2017 David Craven <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,12 +48,7 @@
mount-flags->bit-mask
check-file-system
- mount-file-system)
- #:re-export (mount
- umount
- MS_BIND
- MS_MOVE
- MS_RDONLY))
+ mount-file-system))
;;; Commentary:
;;;
@@ -61,13 +57,6 @@
;;;
;;; Code:
-;; 'mount' is already defined in the statically linked Guile used for initial
-;; RAM disks, in which case the bindings in (guix build syscalls) do not work
-;; (the FFI bindings do not work there). Override them in that case.
-(when (module-defined? the-scm-module 'mount)
- (set! mount (@ (guile) mount))
- (set! umount (@ (guile) umount)))
-
(define (bind-mount source target)
"Bind-mount SOURCE at TARGET."
(mount source target "" MS_BIND))
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index c34a3f7c1..360ef3fae 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
#:use-module (ice-9 match)
#:use-module (ice-9 ftw)
#:use-module (guix build utils)
+ #:use-module (guix build syscalls)
#:use-module (gnu build linux-modules)
#:use-module (gnu build file-systems)
#:export (mount-essential-file-systems
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index d7feb3a08..5ca7bf8e3 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,6 +19,7 @@
(define-module (gnu build linux-modules)
#:use-module (guix elf)
+ #:use-module (guix build syscalls)
#:use-module (rnrs io ports)
#:use-module (rnrs bytevectors)
#:use-module (srfi srfi-1)
--
2.12.2
- bug#26341: [PATCH 1/5] build: syscalls: Add reboot., (continued)
bug#26341: [PATCH 3/5] build: syscalls: Add mount and umount to #:replace list., Mathieu Othacehe, 2017/04/08
bug#26341: [PATCH 4/5] build: syscalls: Add load-linux-module., Mathieu Othacehe, 2017/04/08
bug#26341: [PATCH 5/5] build: Fix compilation warnings., Mathieu Othacehe, 2017/04/08
bug#26341: [PATCH 2/5] build: syscalls: Allow use to network-interface syscalls independently of calling context., Mathieu Othacehe, 2017/04/08
bug#26341: [PATCH 1/5] build: syscalls: Add reboot., Mathieu Othacehe, 2017/04/10