Browse Source

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.
version-0.8.3
Ludovic Courtès 8 years ago
parent
commit
548f7a8fa2
  1. 4
      Makefile.am
  2. 16
      gnu-system.am
  3. 4
      gnu/build/activation.scm
  4. 3
      gnu/build/install.scm
  5. 2
      gnu/build/linux-initrd.scm
  6. 6
      gnu/build/vm.scm
  7. 2
      gnu/services/base.scm
  8. 4
      gnu/services/dmd.scm
  9. 8
      gnu/system.scm
  10. 6
      gnu/system/linux-initrd.scm
  11. 12
      gnu/system/vm.scm
  12. 2
      guix/scripts/system.scm

4
Makefile.am

@ -62,7 +62,6 @@ MODULES = \
guix/build/git.scm \
guix/build/gnu-build-system.scm \
guix/build/gnu-dist.scm \
guix/build/linux-initrd.scm \
guix/build/perl-build-system.scm \
guix/build/python-build-system.scm \
guix/build/utils.scm \
@ -70,9 +69,6 @@ MODULES = \
guix/build/pull.scm \
guix/build/rpath.scm \
guix/build/svn.scm \
guix/build/vm.scm \
guix/build/install.scm \
guix/build/activation.scm \
guix/build/syscalls.scm \
guix/build/emacs-utils.scm \
guix/packages.scm \

16
gnu-system.am

@ -28,7 +28,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/acl.scm \
gnu/packages/admin.scm \
gnu/packages/algebra.scm \
gnu/packages/aidc.scm \
gnu/packages/aidc.scm \
gnu/packages/apl.scm \
gnu/packages/apr.scm \
gnu/packages/asciidoc.scm \
@ -58,7 +58,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/compression.scm \
gnu/packages/complexity.scm \
gnu/packages/conkeror.scm \
gnu/packages/cook.scm \
gnu/packages/cook.scm \
gnu/packages/cpio.scm \
gnu/packages/cppi.scm \
gnu/packages/cross-base.scm \
@ -151,7 +151,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/lightning.scm \
gnu/packages/links.scm \
gnu/packages/linux.scm \
gnu/packages/lisp.scm \
gnu/packages/lisp.scm \
gnu/packages/lout.scm \
gnu/packages/lsh.scm \
gnu/packages/lsof.scm \
@ -180,7 +180,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/nettle.scm \
gnu/packages/node.scm \
gnu/packages/noweb.scm \
gnu/packages/nvi.scm \
gnu/packages/nvi.scm \
gnu/packages/ocaml.scm \
gnu/packages/ocrad.scm \
gnu/packages/onc-rpc.scm \
@ -277,7 +277,13 @@ GNU_SYSTEM_MODULES = \
gnu/system/linux.scm \
gnu/system/linux-initrd.scm \
gnu/system/shadow.scm \
gnu/system/vm.scm
gnu/system/vm.scm \
\
gnu/build/activation.scm \
gnu/build/install.scm \
gnu/build/linux-initrd.scm \
gnu/build/vm.scm
patchdir = $(guilemoduledir)/gnu/packages/patches
dist_patch_DATA = \

4
guix/build/activation.scm → gnu/build/activation.scm

@ -16,9 +16,9 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build activation)
(define-module (gnu build activation)
#:use-module (gnu build linux-initrd)
#:use-module (guix build utils)
#:use-module (guix build linux-initrd)
#:use-module (ice-9 ftw)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)

3
guix/build/install.scm → gnu/build/install.scm

@ -16,9 +16,8 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build install)
(define-module (gnu build install)
#:use-module (guix build utils)
#:use-module (guix build install)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:export (install-grub

2
guix/build/linux-initrd.scm → gnu/build/linux-initrd.scm

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

6
guix/build/vm.scm → gnu/build/vm.scm

@ -16,10 +16,10 @@
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build vm)
(define-module (gnu build vm)
#:use-module (guix build utils)
#:use-module (guix build linux-initrd)
#:use-module (guix build install)
#:use-module (gnu build linux-initrd)
#:use-module (gnu build install)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (ice-9 rdelim)

2
gnu/services/base.scm

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

4
gnu/services/dmd.scm

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

8
gnu/system.scm

@ -362,9 +362,9 @@ alias ll='ls -l'
stateful part of OS, including user accounts and groups, special directories,
etc."
(define %modules
'((guix build activation)
(guix build utils)
(guix build linux-initrd)))
'((gnu build activation)
(gnu build linux-initrd)
(guix build utils)))
(define (service-activations services)
;; Return the activation scripts for SERVICES.
@ -399,7 +399,7 @@ etc."
(set! %load-compiled-path
(cons #$compiled %load-compiled-path)))
(use-modules (guix build activation))
(use-modules (gnu build activation))
;; Populate /etc.
(activate-etc #$etc)

6
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))

12
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

2
guix/scripts/system.scm

@ -28,7 +28,7 @@
#:use-module (guix profiles)
#:use-module (guix scripts build)
#:use-module (guix build utils)
#:use-module (guix build install)
#:use-module (gnu build install)
#:use-module (gnu system)
#:use-module (gnu system vm)
#:use-module (gnu system grub)

Loading…
Cancel
Save