diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 10:47:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-03 15:43:07 +0200 |
| commit | 548f7a8fa2a4745d0e35e175e201513857440991 (patch) | |
| tree | 5fa6118434b77716c93fac9ac2dac51ca257f807 /gnu/system | |
| parent | 141360b5b257715fdca2db4fc106b4220788ae06 (diff) | |
| download | guix-548f7a8fa2a4745d0e35e175e201513857440991.tar guix-548f7a8fa2a4745d0e35e175e201513857440991.tar.gz | |
Move operating system helpers from (guix build …) to (gnu build …).
* guix/build/activation.scm, guix/build/install.scm,
guix/build/linux-initrd.scm, guix/build/vm.scm: Move to...
* gnu/build: ... here.
* Makefile.am (MODULES): Remove the above guix/build/ files.
* gnu-system.am (GNU_SYSTEM_MODULES): Add the above gnu/build/ files
here.
* gnu/services/base.scm, gnu/services/dmd.scm, gnu/system.scm,
gnu/system/linux-initrd.scm, gnu/system/vm.scm,
guix/scripts/system.scm: Adjust to the new module names.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 6 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index e48b399a9d..6d9e23277f 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -75,7 +75,7 @@ initrd." (mlet* %store-monad ((source (imported-modules modules)) (compiled (compiled-modules modules))) (define builder - ;; TODO: Move most of this code to (guix build linux-initrd). + ;; TODO: Move most of this code to (gnu build linux-initrd). #~(begin (use-modules (guix build utils) (ice-9 pretty-print) @@ -277,7 +277,7 @@ exception and backtrace!)." (expression->initrd #~(begin - (use-modules (guix build linux-initrd) + (use-modules (gnu build linux-initrd) (guix build utils) (srfi srfi-26)) @@ -293,7 +293,7 @@ exception and backtrace!)." #:volatile-root? '#$volatile-root?)) #:name "base-initrd" #:modules '((guix build utils) - (guix build linux-initrd)) + (gnu build linux-initrd)) #:to-copy helper-packages #:linux linux-libre #:linux-modules linux-modules)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 42fc23ee8f..be9cf6b457 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -23,7 +23,7 @@ #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix monads) - #:use-module ((guix build vm) + #:use-module ((gnu build vm) #:select (qemu-command)) #:use-module (gnu packages base) #:use-module (gnu packages guile) @@ -112,9 +112,9 @@ input tuple. The output file name is when building for SYSTEM." (qemu qemu-headless) (env-vars '()) (modules - '((guix build vm) - (guix build install) - (guix build linux-initrd) + '((gnu build vm) + (gnu build install) + (gnu build linux-initrd) (guix build utils))) (guile-for-build (%guile-for-build)) @@ -164,7 +164,7 @@ made available under the /xchg CIFS share." ;; Code that launches the VM that evaluates EXP. #~(begin (use-modules (guix build utils) - (guix build vm)) + (gnu build vm)) (let ((inputs '#$(list qemu coreutils)) (linux (string-append #$linux "/bzImage")) @@ -222,7 +222,7 @@ the image." (expression->derivation-in-linux-vm name #~(begin - (use-modules (guix build vm) + (use-modules (gnu build vm) (guix build utils)) (let ((inputs |