futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system: image: Remove "image-root" derivation when building ISO.

Browse Source 
The "image-root" derivation output is used as a temporary directory that is
passed to GNU Xorriso later on. By merging the creation of this directory and
the production of an ISO image, we can get rid of the derivation.

* gnu/system/image.scm (system-iso9660-image): Merge "image-root" and
"iso9660-image" derivations so that we spare an extra derivation.
This commit is contained in:
Mathieu Othacehe 2020-06-22 16:14:01 +02:00
parent 0919d6148f
commit 1cb9effc3e
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/system/image.scm
View File

@ -388,33 +388,31 @@ used in the image. "
(graph (match inputs
(((names . _) ...)
names)))
(root-builder
(with-imported-modules*
(sql-schema #$schema)
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8")
(initialize-root-partition #$output
#:references-graphs '#$graph
#:deduplicate? #f
#:system-directory #$os)))
(image-root
(computed-file "image-root" root-builder
#:options `(#:references-graphs ,inputs)))
(builder
(with-imported-modules*
(let* ((inputs '#$(list parted e2fsprogs dosfstools xorriso
sed grep coreutils findutils gawk)))
sed grep coreutils findutils gawk))
(image-root "tmp-root"))
(sql-schema #$schema)
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
(setenv "GUIX_LOCPATH"
#+(file-append glibc-utf8-locales "/lib/locale"))
(setlocale LC_ALL "en_US.utf8")
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
(initialize-root-partition image-root
#:references-graphs '#$graph
#:deduplicate? #f
#:system-directory #$os)
(make-iso9660-image #$xorriso
'#$grub-mkrescue-environment
#$bootloader
#$bootcfg
#$os
#$image-root
image-root
#$output
#:references-graphs '#$graph
#:register-closures? #$register-closures?