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

linux-initrd: Rewrite using gexps. 

* gnu/system/linux-initrd.scm (expression->initrd): Rename 'inputs'
  parameter to 'to-copy'.  Remove 'files-to-copy'.  Rewrite 'builder' as
  a gexp, and use 'gexp->derivation'.
  (qemu-initrd): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2014-04-27 23:06:15 +02:00
parent 8c35bfb68c
commit 0c21d92b1c
1 changed files with 137 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
(define-module (gnu system linux-initrd) (define-module (gnu system linux-initrd)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix store) #:use-module ((guix store)
#:select (%store-prefix)) #:select (%store-prefix))
@ -52,14 +53,14 @@
(name "guile-initrd") (name "guile-initrd")
(system (%current-system)) (system (%current-system))
(modules '()) (modules '())
(inputs '()) (to-copy '())
(linux #f) (linux #f)
(linux-modules '())) (linux-modules '()))
"Return a package that contains a Linux initrd (a gzipped cpio archive) "Return a package that contains a Linux initrd (a gzipped cpio archive)
containing GUILE and that evaluates EXP upon booting. LINUX-MODULES is a list containing GUILE and that evaluates EXP upon booting. LINUX-MODULES is a list
of `.ko' file names to be copied from LINUX into the initrd. INPUTS is a list of `.ko' file names to be copied from LINUX into the initrd. TO-COPY is a
of additional inputs to be copied in the initrd. MODULES is a list of Guile list of additional derivations or packages to copy to the initrd. MODULES is
module names to be embedded in the initrd." a list of Guile module names to be embedded in the initrd."
;; General Linux overview in `Documentation/early-userspace/README' and ;; General Linux overview in `Documentation/early-userspace/README' and
;; `Documentation/filesystems/ramfs-rootfs-initramfs.txt'. ;; `Documentation/filesystems/ramfs-rootfs-initramfs.txt'.
@ -68,17 +69,11 @@ module names to be embedded in the initrd."
;; Return a regexp that matches STR exactly. ;; Return a regexp that matches STR exactly.
(string-append "^" (regexp-quote str) "$")) (string-append "^" (regexp-quote str) "$"))
(define (files-to-copy) (mlet* %store-monad ((source (imported-modules modules))
(mlet %store-monad ((inputs (lower-inputs inputs))) (compiled (compiled-modules modules)))
(return (map (match-lambda (define builder
((_ drv) ;; TODO: Move most of this code to (guix build linux-initrd).
(derivation->output-path drv)) #~(begin
((_ drv sub-drv)
(derivation->output-path drv sub-drv)))
inputs))))
(define (builder to-copy)
`(begin
(use-modules (guix build utils) (use-modules (guix build utils)
(ice-9 pretty-print) (ice-9 pretty-print)
(ice-9 popen) (ice-9 popen)
@ -89,13 +84,10 @@ module names to be embedded in the initrd."
(rnrs bytevectors) (rnrs bytevectors)
((system foreign) #:select (sizeof))) ((system foreign) #:select (sizeof)))
(let ((guile (assoc-ref %build-inputs "guile")) (let ((cpio (string-append #$cpio "/bin/cpio"))
(cpio (string-append (assoc-ref %build-inputs "cpio") (gzip (string-append #$gzip "/bin/gzip"))
"/bin/cpio")) (modules #$source)
(gzip (string-append (assoc-ref %build-inputs "gzip") (gos #$compiled)
"/bin/gzip"))
(modules (assoc-ref %build-inputs "modules"))
(gos (assoc-ref %build-inputs "modules/compiled"))
(scm-dir (string-append "share/guile/" (effective-version))) (scm-dir (string-append "share/guile/" (effective-version)))
(go-dir (format #f ".cache/guile/ccache/~a-~a-~a-~a" (go-dir (format #f ".cache/guile/ccache/~a-~a-~a-~a"
(effective-version) (effective-version)
@ -103,16 +95,15 @@ module names to be embedded in the initrd."
"LE" "LE"
"BE") "BE")
(sizeof '*) (sizeof '*)
(effective-version))) (effective-version))))
(out (assoc-ref %outputs "out"))) (mkdir #$output)
(mkdir out)
(mkdir "contents") (mkdir "contents")
(with-directory-excursion "contents" (with-directory-excursion "contents"
(copy-recursively guile ".") (copy-recursively #$guile ".")
(call-with-output-file "init" (call-with-output-file "init"
(lambda (p) (lambda (p)
(format p "#!/bin/guile -ds~%!#~%" guile) (format p "#!/bin/guile -ds~%!#~%" #$guile)
(pretty-print ',exp p))) (pretty-print '#$exp p)))
(chmod "init" #o555) (chmod "init" #o555)
(chmod "bin/guile" #o555) (chmod "bin/guile" #o555)
@ -133,35 +124,35 @@ module names to be embedded in the initrd."
#:output-file (string-append go-dir "/init.go")) #:output-file (string-append go-dir "/init.go"))
;; Copy Linux modules. ;; Copy Linux modules.
(let* ((linux (assoc-ref %build-inputs "linux")) (let* ((linux #$linux)
(module-dir (and linux (module-dir (and linux
(string-append linux "/lib/modules")))) (string-append linux "/lib/modules"))))
(mkdir "modules") (mkdir "modules")
,@(map (lambda (module) #$@(map (lambda (module)
`(match (find-files module-dir #~(match (find-files module-dir
,(string->regexp module)) #$(string->regexp module))
((file) ((file)
(format #t "copying '~a'...~%" file) (format #t "copying '~a'...~%" file)
(copy-file file (string-append "modules/" (copy-file file (string-append "modules/"
,module))) #$module)))
(() (()
(error "module not found" ,module module-dir)) (error "module not found" #$module module-dir))
((_ ...) ((_ ...)
(error "several modules by that name" (error "several modules by that name"
,module module-dir)))) #$module module-dir))))
linux-modules)) linux-modules))
,@(if (null? to-copy) (let ((store #$(string-append "." (%store-prefix)))
'() (to-copy '#$to-copy))
`((let ((store ,(string-append "." (%store-prefix)))) (unless (null? to-copy)
(mkdir-p store) (mkdir-p store))
;; XXX: Should we do export-references-graph? ;; XXX: Should we do export-references-graph?
(for-each (lambda (input) (for-each (lambda (input)
(let ((target (let ((target
(string-append store "/" (string-append store "/"
(basename input)))) (basename input))))
(copy-recursively input target))) (copy-recursively input target)))
',to-copy)))) to-copy))
;; Reset the timestamps of all the files that will make it in the ;; Reset the timestamps of all the files that will make it in the
;; initrd. ;; initrd.
@ -170,7 +161,7 @@ module names to be embedded in the initrd."
(system* cpio "--version") (system* cpio "--version")
(let ((pipe (open-pipe* OPEN_WRITE cpio "-o" (let ((pipe (open-pipe* OPEN_WRITE cpio "-o"
"-O" (string-append out "/initrd") "-O" (string-append #$output "/initrd")
"-H" "newc" "--null"))) "-H" "newc" "--null")))
(define print0 (define print0
(let ((len (string-length "./"))) (let ((len (string-length "./")))
@ -195,27 +186,12 @@ module names to be embedded in the initrd."
".") ".")
(and (zero? (close-pipe pipe)) (and (zero? (close-pipe pipe))
(with-directory-excursion out (with-directory-excursion #$output
(and (zero? (system* gzip "--best" "initrd")) (and (zero? (system* gzip "--best" "initrd"))
(rename-file "initrd.gz" "initrd"))))))))) (rename-file "initrd.gz" "initrd")))))))))
(mlet* %store-monad (gexp->derivation name builder
((source (imported-modules modules)) #:modules '((guix build utils)))))
(compiled (compiled-modules modules))
(inputs (lower-inputs
`(("guile" ,guile)
("cpio" ,cpio)
("gzip" ,gzip)
("modules" ,source)
("modules/compiled" ,compiled)
,@(if linux
`(("linux" ,linux))
'())
,@inputs)))
(to-copy (files-to-copy)))
(derivation-expression name (builder to-copy)
#:modules '((guix build utils))
#:inputs inputs)))
(define* (qemu-initrd #:key (define* (qemu-initrd #:key
guile-modules-in-chroot? guile-modules-in-chroot?
@ -257,26 +233,26 @@ to it are lost."
'("fuse.ko") '("fuse.ko")
'()))) '())))
(mlet %store-monad
((unionfs (package-file unionfs-fuse/static "bin/unionfs")))
(expression->initrd (expression->initrd
`(begin #~(begin
(use-modules (guix build linux-initrd)) (use-modules (guix build linux-initrd)
(srfi srfi-26))
(boot-system #:mounts ',mounts (boot-system #:mounts '#$mounts
#:linux-modules ',linux-modules #:linux-modules '#$linux-modules
#:qemu-guest-networking? #t #:qemu-guest-networking? #t
#:guile-modules-in-chroot? ',guile-modules-in-chroot? #:guile-modules-in-chroot? '#$guile-modules-in-chroot?
#:unionfs ,unionfs #:unionfs (and=> #$(and volatile-root? unionfs-fuse/static)
#:volatile-root? ',volatile-root?)) (cut string-append <> "/bin/unionfs"))
#:volatile-root? '#$volatile-root?))
#:name "qemu-initrd" #:name "qemu-initrd"
#:modules '((guix build utils) #:modules '((guix build utils)
(guix build linux-initrd)) (guix build linux-initrd))
#:to-copy (if volatile-root?
(list unionfs-fuse/static)
'())
#:linux linux-libre #:linux linux-libre
#:linux-modules linux-modules #:linux-modules linux-modules))
#:inputs (if volatile-root?
`(("unionfs" ,unionfs-fuse/static))
'()))))
(define (gnu-system-initrd) (define (gnu-system-initrd)
"Initrd for the GNU system itself, with nothing QEMU-specific." "Initrd for the GNU system itself, with nothing QEMU-specific."