diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-24 17:41:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-24 18:05:03 +0200 |
| commit | e8277f90c88be9d65b948c299620fd9d6d9b28ae (patch) | |
| tree | 59b7b3e3fbaed726ac1a5a416b542373610d3284 /gnu/system | |
| parent | 7a18c3cc1098eab7499f6c8352211258432a527a (diff) | |
| download | guix-e8277f90c88be9d65b948c299620fd9d6d9b28ae.tar.gz guix-e8277f90c88be9d65b948c299620fd9d6d9b28ae.zip | |
linux-initrd: Use (guix cpio) instead of GNU cpio.
* gnu/build/linux-initrd.scm (write-cpio-archive): Remove 'open-pipe*' and
related calls. Compute list of files in 'files' variable. Use
'cpio:write-cpio-archive'. Remove #:cpio parameter.
(build-initrd): Remove #:cpio parameter.
* gnu/system/linux-initrd.scm (expression->initrd): Likewise, and adjust
BUILDER accordingly. Add (guix cpio) to #:modules.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 83685adcbc..74dacf1ecd 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -25,7 +25,6 @@ #:select (%store-prefix)) #:use-module ((guix derivations) #:select (derivation->output-path)) - #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages linux) #:use-module (gnu packages guile) @@ -51,7 +50,6 @@ (define* (expression->initrd exp #:key (guile %guile-static-stripped) - (cpio cpio) (gzip gzip) (name "guile-initrd") (system (%current-system)) @@ -78,11 +76,11 @@ MODULES is a list of Guile module names to be embedded in the initrd." #:init #$init ;; Copy everything INIT refers to into the initrd. #:references-graphs '("closure") - #:cpio (string-append #$cpio "/bin/cpio") #:gzip (string-append #$gzip "/bin/gzip")))) (gexp->derivation name builder - #:modules '((guix build utils) + #:modules '((guix cpio) + (guix build utils) (guix build store-copy) (gnu build linux-initrd)) #:references-graphs `(("closure" ,init))))) |