mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
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.
This commit is contained in:
parent
548f7a8fa2
commit
8a9e21d1f7
9 changed files with 12 additions and 12 deletions
|
@ -281,7 +281,7 @@ GNU_SYSTEM_MODULES = \
|
|||
\
|
||||
gnu/build/activation.scm \
|
||||
gnu/build/install.scm \
|
||||
gnu/build/linux-initrd.scm \
|
||||
gnu/build/linux-boot.scm \
|
||||
gnu/build/vm.scm
|
||||
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu build activation)
|
||||
#:use-module (gnu build linux-initrd)
|
||||
#:use-module (gnu build linux-boot)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (ice-9 ftw)
|
||||
#:use-module (ice-9 match)
|
||||
|
|
|
@ -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 (gnu build linux-initrd)
|
||||
(define-module (gnu build linux-boot)
|
||||
#:use-module (rnrs io ports)
|
||||
#:use-module (rnrs bytevectors)
|
||||
#:use-module (system foreign)
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
(define-module (gnu build vm)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (gnu build linux-initrd)
|
||||
#:use-module (gnu build linux-boot)
|
||||
#:use-module (gnu build install)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 regex)
|
||||
|
|
|
@ -29,7 +29,7 @@ (define-module (gnu services base)
|
|||
#:use-module ((gnu packages base)
|
||||
#:select (canonical-package glibc))
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module ((gnu build linux-initrd)
|
||||
#:use-module ((gnu build linux-boot)
|
||||
#:select (mount-flags->bit-mask))
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix monads)
|
||||
|
|
|
@ -35,7 +35,7 @@ (define (dmd-configuration-file services)
|
|||
(define modules
|
||||
;; Extra modules visible to dmd.conf.
|
||||
'((guix build syscalls)
|
||||
(gnu build linux-initrd)
|
||||
(gnu build linux-boot)
|
||||
(guix build utils)))
|
||||
|
||||
(mlet %store-monad ((modules (imported-modules modules))
|
||||
|
@ -50,7 +50,7 @@ (define config
|
|||
(use-modules (ice-9 ftw)
|
||||
(guix build syscalls)
|
||||
(guix build utils)
|
||||
((gnu build linux-initrd)
|
||||
((gnu build linux-boot)
|
||||
#:select (check-file-system canonicalize-device-spec)))
|
||||
|
||||
(register-services
|
||||
|
|
|
@ -363,7 +363,7 @@ (define (operating-system-activation-script os)
|
|||
etc."
|
||||
(define %modules
|
||||
'((gnu build activation)
|
||||
(gnu build linux-initrd)
|
||||
(gnu build linux-boot)
|
||||
(guix build utils)))
|
||||
|
||||
(define (service-activations services)
|
||||
|
|
|
@ -75,7 +75,7 @@ (define (string->regexp str)
|
|||
(mlet* %store-monad ((source (imported-modules modules))
|
||||
(compiled (compiled-modules modules)))
|
||||
(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
|
||||
(use-modules (guix build utils)
|
||||
(ice-9 pretty-print)
|
||||
|
@ -277,7 +277,7 @@ (define helper-packages
|
|||
|
||||
(expression->initrd
|
||||
#~(begin
|
||||
(use-modules (gnu build linux-initrd)
|
||||
(use-modules (gnu build linux-boot)
|
||||
(guix build utils)
|
||||
(srfi srfi-26))
|
||||
|
||||
|
@ -293,7 +293,7 @@ (define helper-packages
|
|||
#:volatile-root? '#$volatile-root?))
|
||||
#:name "base-initrd"
|
||||
#:modules '((guix build utils)
|
||||
(gnu build linux-initrd))
|
||||
(gnu build linux-boot))
|
||||
#:to-copy helper-packages
|
||||
#:linux linux-libre
|
||||
#:linux-modules linux-modules))
|
||||
|
|
|
@ -114,7 +114,7 @@ (define* (expression->derivation-in-linux-vm name exp
|
|||
(modules
|
||||
'((gnu build vm)
|
||||
(gnu build install)
|
||||
(gnu build linux-initrd)
|
||||
(gnu build linux-boot)
|
||||
(guix build utils)))
|
||||
(guile-for-build
|
||||
(%guile-for-build))
|
||||
|
|
Loading…
Reference in a new issue