nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename (gnu build linux-initrd) to (gnu build linux-boot). 

* gnu/build/linux-initrd.scm: Rename to...
* gnu/build/linux-boot.scm: ... this.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/build/activation.scm, gnu/build/vm.scm, gnu/services/base.scm,
  gnu/services/dmd.scm, gnu/system.scm, gnu/system/linux-initrd.scm,
  gnu/system/vm.scm: Adjust accordingly.
master
Ludovic Courtès 2014-09-03 11:14:12 +02:00
parent 548f7a8fa2
commit 8a9e21d1f7
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu-system.am
View File

@ -281,7 +281,7 @@ GNU_SYSTEM_MODULES = \
\ \
gnu/build/activation.scm \ gnu/build/activation.scm \
gnu/build/install.scm \ gnu/build/install.scm \
gnu/build/linux-initrd.scm \ gnu/build/linux-boot.scm \
gnu/build/vm.scm gnu/build/vm.scm

2
gnu/build/activation.scm
View File

@ -17,7 +17,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu build activation) (define-module (gnu build activation)
#:use-module (gnu build linux-initrd) #:use-module (gnu build linux-boot)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 match) #:use-module (ice-9 match)

2
gnu/build/linux-initrd.scm → gnu/build/linux-boot.scm
View File

@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu build linux-initrd) (define-module (gnu build linux-boot)
#:use-module (rnrs io ports) #:use-module (rnrs io ports)
#:use-module (rnrs bytevectors) #:use-module (rnrs bytevectors)
#:use-module (system foreign) #:use-module (system foreign)

2
gnu/build/vm.scm
View File

@ -18,7 +18,7 @@
(define-module (gnu build vm) (define-module (gnu build vm)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (gnu build linux-initrd) #:use-module (gnu build linux-boot)
#:use-module (gnu build install) #:use-module (gnu build install)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)

2
gnu/services/base.scm
View File

@ -29,7 +29,7 @@
#:use-module ((gnu packages base) #:use-module ((gnu packages base)
#:select (canonical-package glibc)) #:select (canonical-package glibc))
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module ((gnu build linux-initrd) #:use-module ((gnu build linux-boot)
#:select (mount-flags->bit-mask)) #:select (mount-flags->bit-mask))
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix monads) #:use-module (guix monads)

4
gnu/services/dmd.scm
View File

@ -35,7 +35,7 @@
(define modules (define modules
;; Extra modules visible to dmd.conf. ;; Extra modules visible to dmd.conf.
'((guix build syscalls) '((guix build syscalls)
(gnu build linux-initrd) (gnu build linux-boot)
(guix build utils))) (guix build utils)))
(mlet %store-monad ((modules (imported-modules modules)) (mlet %store-monad ((modules (imported-modules modules))
@ -50,7 +50,7 @@
(use-modules (ice-9 ftw) (use-modules (ice-9 ftw)
(guix build syscalls) (guix build syscalls)
(guix build utils) (guix build utils)
((gnu build linux-initrd) ((gnu build linux-boot)
#:select (check-file-system canonicalize-device-spec))) #:select (check-file-system canonicalize-device-spec)))
(register-services (register-services

2
gnu/system.scm
View File

@ -363,7 +363,7 @@ stateful part of OS, including user accounts and groups, special directories,
etc." etc."
(define %modules (define %modules
'((gnu build activation) '((gnu build activation)
(gnu build linux-initrd) (gnu build linux-boot)
(guix build utils))) (guix build utils)))
(define (service-activations services) (define (service-activations services)

6
gnu/system/linux-initrd.scm
View File

@ -75,7 +75,7 @@ initrd."
(mlet* %store-monad ((source (imported-modules modules)) (mlet* %store-monad ((source (imported-modules modules))
(compiled (compiled-modules modules))) (compiled (compiled-modules modules)))
(define builder (define builder
;; TODO: Move most of this code to (gnu build linux-initrd). ;; TODO: Move most of this code to (gnu build linux-boot).
#~(begin #~(begin
(use-modules (guix build utils) (use-modules (guix build utils)
(ice-9 pretty-print) (ice-9 pretty-print)
@ -277,7 +277,7 @@ exception and backtrace!)."
(expression->initrd (expression->initrd
#~(begin #~(begin
(use-modules (gnu build linux-initrd) (use-modules (gnu build linux-boot)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
@ -293,7 +293,7 @@ exception and backtrace!)."
#:volatile-root? '#$volatile-root?)) #:volatile-root? '#$volatile-root?))
#:name "base-initrd" #:name "base-initrd"
#:modules '((guix build utils) #:modules '((guix build utils)
(gnu build linux-initrd)) (gnu build linux-boot))
#:to-copy helper-packages #:to-copy helper-packages
#:linux linux-libre #:linux linux-libre
#:linux-modules linux-modules)) #:linux-modules linux-modules))

2
gnu/system/vm.scm
View File

@ -114,7 +114,7 @@ input tuple. The output file name is when building for SYSTEM."
(modules (modules
'((gnu build vm) '((gnu build vm)
(gnu build install) (gnu build install)
(gnu build linux-initrd) (gnu build linux-boot)
(guix build utils))) (guix build utils)))
(guile-for-build (guile-for-build
(%guile-for-build)) (%guile-for-build))