2013-02-16 02:28:26 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2019-02-11 21:52:28 +00:00
|
|
|
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
2016-02-22 19:23:14 +00:00
|
|
|
|
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
2017-12-03 01:17:45 +00:00
|
|
|
|
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
2017-04-15 12:22:24 +00:00
|
|
|
|
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
2017-05-07 13:31:30 +00:00
|
|
|
|
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
2018-03-15 04:09:12 +00:00
|
|
|
|
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
2013-02-16 02:28:26 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; 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 system vm)
|
2013-08-31 21:01:56 +00:00
|
|
|
|
#:use-module (guix config)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:use-module (guix store)
|
2014-04-26 14:36:48 +00:00
|
|
|
|
#:use-module (guix gexp)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:use-module (guix derivations)
|
|
|
|
|
#:use-module (guix packages)
|
gnu: vm: Rewrite helper functions as monadic functions.
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
2013-10-03 19:30:30 +00:00
|
|
|
|
#:use-module (guix monads)
|
2014-11-20 22:32:54 +00:00
|
|
|
|
#:use-module (guix records)
|
2016-09-04 21:42:50 +00:00
|
|
|
|
#:use-module (guix modules)
|
2017-11-29 14:12:01 +00:00
|
|
|
|
#:use-module (guix utils)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
#:use-module (gcrypt hash)
|
2018-03-08 10:55:06 +00:00
|
|
|
|
#:use-module (guix base32)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#:use-module ((guix self) #:select (make-config.scm))
|
2014-11-20 22:32:54 +00:00
|
|
|
|
|
2014-09-03 08:47:05 +00:00
|
|
|
|
#:use-module ((gnu build vm)
|
2014-07-13 14:07:26 +00:00
|
|
|
|
#:select (qemu-command))
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-26 22:25:17 +00:00
|
|
|
|
#:use-module (gnu packages base)
|
2017-02-09 18:46:47 +00:00
|
|
|
|
#:use-module (gnu packages bootloaders)
|
2017-07-03 08:05:03 +00:00
|
|
|
|
#:use-module (gnu packages cdrom)
|
2018-02-19 04:45:03 +00:00
|
|
|
|
#:use-module (gnu packages compression)
|
2013-09-04 22:45:53 +00:00
|
|
|
|
#:use-module (gnu packages guile)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
#:autoload (gnu packages gnupg) (guile-gcrypt)
|
gnu: Split (gnu packages base), adding (gnu packages commencement).
* gnu/packages/base.scm (gnu-make-boot0, diffutils-boot0,
findutils-boot0, %boot0-inputs, nix-system->gnu-triplet, boot-triplet,
binutils-boot0, gcc-boot0, perl-boot0, linux-libre-headers-boot0,
texinfo-boot0, %boot1-inputs, glibc-final-with-bootstrap-bash,
cross-gcc-wrapper, static-bash-for-glibc, glibc-final,
gcc-boot0-wrapped, %boot2-inputs, binutils-final, libstdc++,
gcc-final, ld-wrapper-boot3, %boot3-inputs, bash-final, %boot4-inputs,
guile-final, gnu-make-final, ld-wrapper, coreutils-final, grep-final,
%boot5-inputs, %final-inputs, canonical-package, gcc-toolchain,
gcc-toolchain-4.8, gcc-toolchain-4.9): Move to...
* gnu/packages/commencement.scm: ... here. New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* build-aux/check-final-inputs-self-contained.scm: Adjust accordingly.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/make-bootstrap.scm: Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/gnu.scm (standard-packages, gnu-build,
gnu-cross-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* guix/download.scm (url-fetch): Likewise.
* guix/gexp.scm (default-guile): Likewise.
* guix/git-download.scm (git-fetch): Likewise.
* guix/monads.scm (run-with-store): Likewise.
* guix/packages.scm (default-guile): Likewise.
* guix/scripts/package.scm (guix-package): Likewise.
* guix/scripts/refresh.scm: Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
* tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths):
Likewise.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/guix-package.sh: Likewise.
* gnu/services/base.scm: Use 'canonical-package' instead of xxx-final.
* gnu/services/xorg.scm: Likewise.
* gnu/system/vm.scm: Likewise.
* guix/scripts/pull.scm (guix-pull): Likewise.
2014-08-26 22:25:17 +00:00
|
|
|
|
#:use-module (gnu packages gawk)
|
2013-09-04 22:45:53 +00:00
|
|
|
|
#:use-module (gnu packages bash)
|
2013-12-09 22:45:27 +00:00
|
|
|
|
#:use-module (gnu packages less)
|
2017-07-12 12:35:57 +00:00
|
|
|
|
#:use-module (gnu packages virtualization)
|
2014-06-03 20:12:05 +00:00
|
|
|
|
#:use-module (gnu packages disk)
|
2013-09-26 22:45:53 +00:00
|
|
|
|
#:use-module (gnu packages zile)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:use-module (gnu packages linux)
|
|
|
|
|
#:use-module ((gnu packages make-bootstrap)
|
|
|
|
|
#:select (%guile-static-stripped))
|
2014-01-13 22:21:47 +00:00
|
|
|
|
#:use-module (gnu packages admin)
|
2013-09-11 20:36:50 +00:00
|
|
|
|
|
2017-05-09 08:52:02 +00:00
|
|
|
|
#:use-module (gnu bootloader)
|
2017-10-19 21:11:36 +00:00
|
|
|
|
#:use-module (gnu bootloader grub)
|
2013-09-11 20:36:50 +00:00
|
|
|
|
#:use-module (gnu system shadow)
|
2015-11-03 17:08:47 +00:00
|
|
|
|
#:use-module (gnu system pam)
|
2019-03-22 16:48:37 +00:00
|
|
|
|
#:use-module (gnu system linux-container)
|
2014-01-29 12:04:00 +00:00
|
|
|
|
#:use-module (gnu system linux-initrd)
|
2017-05-15 20:24:18 +00:00
|
|
|
|
#:use-module (gnu bootloader)
|
2014-05-20 19:59:08 +00:00
|
|
|
|
#:use-module (gnu system file-systems)
|
2013-12-09 20:32:36 +00:00
|
|
|
|
#:use-module (gnu system)
|
2014-02-19 19:58:24 +00:00
|
|
|
|
#:use-module (gnu services)
|
2019-04-16 21:15:02 +00:00
|
|
|
|
#:use-module (gnu services base)
|
2017-09-06 07:28:28 +00:00
|
|
|
|
#:use-module (gnu system uuid)
|
2013-09-11 20:36:50 +00:00
|
|
|
|
|
2013-08-31 20:55:04 +00:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2017-09-06 21:16:09 +00:00
|
|
|
|
#:use-module (rnrs bytevectors)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:use-module (ice-9 match)
|
2013-09-11 20:36:50 +00:00
|
|
|
|
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:export (expression->derivation-in-linux-vm
|
2013-09-11 18:08:53 +00:00
|
|
|
|
qemu-image
|
2016-05-04 21:33:59 +00:00
|
|
|
|
virtualized-operating-system
|
2014-01-31 13:36:48 +00:00
|
|
|
|
system-qemu-image
|
2014-11-20 22:32:54 +00:00
|
|
|
|
|
2014-01-31 13:36:48 +00:00
|
|
|
|
system-qemu-image/shared-store
|
2014-05-22 21:12:36 +00:00
|
|
|
|
system-qemu-image/shared-store-script
|
2017-07-18 08:36:21 +00:00
|
|
|
|
system-disk-image
|
2018-02-19 04:45:03 +00:00
|
|
|
|
system-docker-image
|
2017-07-18 08:36:21 +00:00
|
|
|
|
|
|
|
|
|
virtual-machine
|
|
|
|
|
virtual-machine?))
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; Tools to evaluate build expressions within virtual machines.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2014-05-02 22:26:07 +00:00
|
|
|
|
(define %linux-vm-file-systems
|
2018-03-15 04:09:12 +00:00
|
|
|
|
;; File systems mounted for 'derivation-in-linux-vm'. These are shared with
|
|
|
|
|
;; the host over 9p.
|
2019-04-14 15:03:34 +00:00
|
|
|
|
;;
|
|
|
|
|
;; The 9p documentation says that cache=loose is "intended for exclusive,
|
|
|
|
|
;; read-only mounts", without additional details. It's much faster than the
|
|
|
|
|
;; default cache=none, especially when copying and registering store items.
|
|
|
|
|
;; Thus, use cache=loose, except for /xchg where we want to ensure
|
|
|
|
|
;; consistency.
|
2014-05-02 22:26:07 +00:00
|
|
|
|
(list (file-system
|
|
|
|
|
(mount-point (%store-prefix))
|
|
|
|
|
(device "store")
|
|
|
|
|
(type "9p")
|
|
|
|
|
(needed-for-boot? #t)
|
2018-09-23 21:31:52 +00:00
|
|
|
|
(flags '(read-only))
|
|
|
|
|
(options "trans=virtio,cache=loose")
|
2014-05-03 22:30:39 +00:00
|
|
|
|
(check? #f))
|
2014-05-02 22:26:07 +00:00
|
|
|
|
(file-system
|
|
|
|
|
(mount-point "/xchg")
|
|
|
|
|
(device "xchg")
|
|
|
|
|
(type "9p")
|
|
|
|
|
(needed-for-boot? #t)
|
2019-04-14 15:03:34 +00:00
|
|
|
|
(options "trans=virtio")
|
2018-03-15 04:09:12 +00:00
|
|
|
|
(check? #f))
|
|
|
|
|
(file-system
|
|
|
|
|
(mount-point "/tmp")
|
|
|
|
|
(device "tmp")
|
|
|
|
|
(type "9p")
|
|
|
|
|
(needed-for-boot? #t)
|
2018-09-23 21:31:52 +00:00
|
|
|
|
(options "trans=virtio,cache=loose")
|
2014-05-03 22:30:39 +00:00
|
|
|
|
(check? #f))))
|
2014-05-02 22:26:07 +00:00
|
|
|
|
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(define not-config?
|
|
|
|
|
;; Select (guix …) and (gnu …) modules, except (guix config).
|
|
|
|
|
(match-lambda
|
|
|
|
|
(('guix 'config) #f)
|
|
|
|
|
(('guix rest ...) #t)
|
|
|
|
|
(('gnu rest ...) #t)
|
|
|
|
|
(rest #f)))
|
|
|
|
|
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
(define gcrypt-sqlite3&co
|
|
|
|
|
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
|
|
|
|
|
(append-map (lambda (package)
|
|
|
|
|
(cons package
|
2019-02-11 21:52:28 +00:00
|
|
|
|
(match (package-transitive-propagated-inputs package)
|
|
|
|
|
(((labels packages) ...)
|
|
|
|
|
packages))))
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
(list guile-gcrypt guile-sqlite3)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
|
gnu: vm: Rewrite helper functions as monadic functions.
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
2013-10-03 19:30:30 +00:00
|
|
|
|
(define* (expression->derivation-in-linux-vm name exp
|
2013-02-16 02:28:26 +00:00
|
|
|
|
#:key
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(system (%current-system)) target
|
2013-02-16 02:28:26 +00:00
|
|
|
|
(linux linux-libre)
|
2014-01-29 12:04:00 +00:00
|
|
|
|
initrd
|
2015-11-20 23:34:32 +00:00
|
|
|
|
(qemu qemu-minimal)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
(env-vars '())
|
|
|
|
|
(guile-for-build
|
|
|
|
|
(%guile-for-build))
|
2018-06-08 12:51:33 +00:00
|
|
|
|
(file-systems
|
|
|
|
|
%linux-vm-file-systems)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
2017-07-18 19:38:16 +00:00
|
|
|
|
(single-file-output? #f)
|
2013-02-16 02:28:26 +00:00
|
|
|
|
(make-disk-image? #f)
|
2013-08-31 20:55:04 +00:00
|
|
|
|
(references-graphs #f)
|
2014-04-09 11:47:57 +00:00
|
|
|
|
(memory-size 256)
|
2014-05-22 20:30:13 +00:00
|
|
|
|
(disk-image-format "qcow2")
|
2017-06-29 22:04:38 +00:00
|
|
|
|
(disk-image-size 'guess))
|
2014-01-29 12:04:00 +00:00
|
|
|
|
"Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a
|
2017-07-18 19:38:16 +00:00
|
|
|
|
derivation). The virtual machine runs with MEMORY-SIZE MiB of memory. In the
|
2018-06-08 12:51:33 +00:00
|
|
|
|
virtual machine, EXP has access to FILE-SYSTEMS, which, by default, includes a
|
|
|
|
|
9p share of the store, the '/xchg' where EXP should put its output file(s),
|
|
|
|
|
and a 9p share of /tmp.
|
2017-07-18 19:38:16 +00:00
|
|
|
|
|
|
|
|
|
If SINGLE-FILE-OUTPUT? is true, copy a single file from '/xchg' to OUTPUT.
|
|
|
|
|
Otherwise, copy the contents of /xchg to a new directory OUTPUT.
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
2014-05-22 20:30:13 +00:00
|
|
|
|
When MAKE-DISK-IMAGE? is true, then create a QEMU disk image of type
|
|
|
|
|
DISK-IMAGE-FORMAT (e.g., 'qcow2' or 'raw'), of DISK-IMAGE-SIZE bytes and
|
2017-06-29 22:04:38 +00:00
|
|
|
|
return it. When DISK-IMAGE-SIZE is 'guess, estimate the image size based
|
|
|
|
|
based on the size of the closure of REFERENCES-GRAPHS.
|
2013-08-31 20:55:04 +00:00
|
|
|
|
|
|
|
|
|
When REFERENCES-GRAPHS is true, it must be a list of file name/store path
|
|
|
|
|
pairs, as for `derivation'. The files containing the reference graphs are
|
|
|
|
|
made available under the /xchg CIFS share."
|
2018-06-06 21:11:18 +00:00
|
|
|
|
(define user-builder
|
|
|
|
|
(program-file "builder-in-linux-vm" exp))
|
|
|
|
|
|
|
|
|
|
(define loader
|
|
|
|
|
;; Invoke USER-BUILDER instead using 'primitive-load'. The reason for
|
|
|
|
|
;; this is to allow USER-BUILDER to dlopen stuff by using a full-featured
|
|
|
|
|
;; Guile, which it couldn't do using the statically-linked guile used in
|
|
|
|
|
;; the initrd. See example at
|
|
|
|
|
;; <https://lists.gnu.org/archive/html/guix-devel/2017-10/msg00233.html>.
|
|
|
|
|
(program-file "linux-vm-loader"
|
|
|
|
|
;; When USER-BUILDER succeeds, reboot (indicating a
|
|
|
|
|
;; success), otherwise die, which causes a kernel panic
|
|
|
|
|
;; ("Attempted to kill init!").
|
2019-03-17 13:39:23 +00:00
|
|
|
|
#~(if (zero? (system* #$user-builder))
|
|
|
|
|
(reboot)
|
|
|
|
|
(exit 1))))
|
2018-06-06 21:11:18 +00:00
|
|
|
|
|
2018-11-15 17:39:18 +00:00
|
|
|
|
(let ((initrd (or initrd
|
|
|
|
|
(base-initrd file-systems
|
|
|
|
|
#:on-error 'backtrace
|
|
|
|
|
#:linux linux
|
|
|
|
|
#:linux-modules %base-initrd-modules
|
|
|
|
|
#:qemu-networking? #t))))
|
2014-04-27 12:58:15 +00:00
|
|
|
|
|
|
|
|
|
(define builder
|
|
|
|
|
;; Code that launches the VM that evaluates EXP.
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
(with-extensions gcrypt-sqlite3&co
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(with-imported-modules `(,@(source-module-closure
|
|
|
|
|
'((guix build utils)
|
|
|
|
|
(gnu build vm))
|
|
|
|
|
#:select? not-config?)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
|
|
|
|
|
;; For consumption by (gnu store database).
|
|
|
|
|
((guix config) => ,(make-config.scm)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils)
|
|
|
|
|
(gnu build vm))
|
|
|
|
|
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(let* ((native-inputs
|
|
|
|
|
'#+(list qemu (canonical-package coreutils)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(linux (string-append #$linux "/"
|
|
|
|
|
#$(system-linux-image-file-name)))
|
2018-11-21 15:19:09 +00:00
|
|
|
|
(initrd #$initrd)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(loader #$loader)
|
|
|
|
|
(graphs '#$(match references-graphs
|
|
|
|
|
(((graph-files . _) ...) graph-files)
|
|
|
|
|
(_ #f)))
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(target #$(or (%current-target-system) (%current-system)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(size #$(if (eq? 'guess disk-image-size)
|
|
|
|
|
#~(+ (* 70 (expt 2 20)) ;ESP
|
|
|
|
|
(estimated-partition-size graphs))
|
|
|
|
|
disk-image-size)))
|
|
|
|
|
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(set-path-environment-variable "PATH" '("bin") native-inputs)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
|
|
|
|
|
(load-in-linux-vm loader
|
|
|
|
|
#:output #$output
|
|
|
|
|
#:linux linux #:initrd initrd
|
2019-08-21 07:19:58 +00:00
|
|
|
|
#:qemu (qemu-command target)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#:memory-size #$memory-size
|
|
|
|
|
#:make-disk-image? #$make-disk-image?
|
|
|
|
|
#:single-file-output? #$single-file-output?
|
2019-08-20 16:00:40 +00:00
|
|
|
|
;; FIXME: ‘target-arm32?’ and
|
|
|
|
|
;; ‘target-aarch64?’ may not operate on the
|
|
|
|
|
;; right system/target values. Rewrite
|
2018-06-06 21:58:18 +00:00
|
|
|
|
;; using ‘let-system’ when available.
|
|
|
|
|
#:target-arm32? #$(target-arm32?)
|
2019-08-20 16:00:40 +00:00
|
|
|
|
#:target-aarch64? #$(target-aarch64?)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#:disk-image-format #$disk-image-format
|
|
|
|
|
#:disk-image-size size
|
|
|
|
|
#:references-graphs graphs))))))
|
2014-04-27 12:58:15 +00:00
|
|
|
|
|
|
|
|
|
(gexp->derivation name builder
|
|
|
|
|
;; TODO: Require the "kvm" feature.
|
|
|
|
|
#:system system
|
2019-08-21 07:19:58 +00:00
|
|
|
|
#:target target
|
2014-04-27 12:58:15 +00:00
|
|
|
|
#:env-vars env-vars
|
|
|
|
|
#:guile-for-build guile-for-build
|
|
|
|
|
#:references-graphs references-graphs)))
|
gnu: vm: Rewrite helper functions as monadic functions.
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
2013-10-03 19:30:30 +00:00
|
|
|
|
|
2019-04-16 21:15:02 +00:00
|
|
|
|
(define (has-guix-service-type? os)
|
|
|
|
|
"Return true if OS contains a service of the type GUIX-SERVICE-TYPE."
|
|
|
|
|
(not (not (find (lambda (service)
|
|
|
|
|
(eq? (service-kind service) guix-service-type))
|
|
|
|
|
(operating-system-services os)))))
|
|
|
|
|
|
2017-07-03 08:05:03 +00:00
|
|
|
|
(define* (iso9660-image #:key
|
|
|
|
|
(name "iso9660-image")
|
2017-07-03 17:57:50 +00:00
|
|
|
|
file-system-label
|
|
|
|
|
file-system-uuid
|
2017-07-03 08:05:03 +00:00
|
|
|
|
(system (%current-system))
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(target (%current-target-system))
|
2017-07-03 08:05:03 +00:00
|
|
|
|
(qemu qemu-minimal)
|
2018-11-16 08:05:45 +00:00
|
|
|
|
os
|
2017-07-03 08:05:03 +00:00
|
|
|
|
bootcfg-drv
|
|
|
|
|
bootloader
|
2019-04-16 21:15:02 +00:00
|
|
|
|
(register-closures? (has-guix-service-type? os))
|
2019-05-18 15:49:05 +00:00
|
|
|
|
(inputs '())
|
|
|
|
|
(grub-mkrescue-environment '()))
|
2017-07-03 08:05:03 +00:00
|
|
|
|
"Return a bootable, stand-alone iso9660 image.
|
|
|
|
|
|
|
|
|
|
INPUTS is a list of inputs (as for packages)."
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(define schema
|
|
|
|
|
(and register-closures?
|
|
|
|
|
(local-file (search-path %load-path
|
|
|
|
|
"guix/store/schema.sql"))))
|
|
|
|
|
|
2017-07-03 08:05:03 +00:00
|
|
|
|
(expression->derivation-in-linux-vm
|
|
|
|
|
name
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
(with-extensions gcrypt-sqlite3&co
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(with-imported-modules `(,@(source-module-closure '((gnu build vm)
|
|
|
|
|
(guix store database)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
#:select? not-config?)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
((guix config) => ,(make-config.scm)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (gnu build vm)
|
|
|
|
|
(guix store database)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
|
|
|
|
|
(sql-schema #$schema)
|
|
|
|
|
|
2019-05-01 19:11:22 +00:00
|
|
|
|
;; 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")
|
|
|
|
|
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(let ((inputs
|
2019-08-21 07:19:58 +00:00
|
|
|
|
'#$(append (list parted e2fsprogs dosfstools xorriso)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(map canonical-package
|
|
|
|
|
(list sed grep coreutils findutils gawk))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(graphs '#$(match inputs
|
|
|
|
|
(((names . _) ...)
|
|
|
|
|
names)))
|
|
|
|
|
;; This variable is unused but allows us to add INPUTS-TO-COPY
|
|
|
|
|
;; as inputs.
|
|
|
|
|
(to-register
|
|
|
|
|
'#$(map (match-lambda
|
|
|
|
|
((name thing) thing)
|
|
|
|
|
((name thing output) `(,thing ,output)))
|
|
|
|
|
inputs)))
|
|
|
|
|
|
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
|
2019-05-18 15:49:05 +00:00
|
|
|
|
(make-iso9660-image #$xorriso
|
|
|
|
|
'#$grub-mkrescue-environment
|
|
|
|
|
#$(bootloader-package bootloader)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#$bootcfg-drv
|
2018-11-16 08:05:45 +00:00
|
|
|
|
#$os
|
2018-06-06 21:58:18 +00:00
|
|
|
|
"/xchg/guixsd.iso"
|
|
|
|
|
#:register-closures? #$register-closures?
|
|
|
|
|
#:closures graphs
|
|
|
|
|
#:volume-id #$file-system-label
|
|
|
|
|
#:volume-uuid #$(and=> file-system-uuid
|
|
|
|
|
uuid-bytevector))))))
|
2017-07-03 08:05:03 +00:00
|
|
|
|
#:system system
|
2019-08-21 07:19:58 +00:00
|
|
|
|
#:target target
|
2018-06-08 13:09:37 +00:00
|
|
|
|
|
|
|
|
|
;; Keep a local file system for /tmp so that we can populate it directly as
|
|
|
|
|
;; root and have files owned by root. See <https://bugs.gnu.org/31752>.
|
|
|
|
|
#:file-systems (remove (lambda (file-system)
|
|
|
|
|
(string=? (file-system-mount-point file-system)
|
|
|
|
|
"/tmp"))
|
|
|
|
|
%linux-vm-file-systems)
|
|
|
|
|
|
2017-07-03 08:05:03 +00:00
|
|
|
|
#:make-disk-image? #f
|
2017-07-18 19:38:16 +00:00
|
|
|
|
#:single-file-output? #t
|
2019-03-27 10:51:18 +00:00
|
|
|
|
#:references-graphs inputs
|
|
|
|
|
|
|
|
|
|
;; Xorriso seems to be quite memory-hungry, so increase the VM's RAM size.
|
|
|
|
|
#:memory-size 512))
|
2017-07-03 08:05:03 +00:00
|
|
|
|
|
gnu: vm: Rewrite helper functions as monadic functions.
* gnu/system/dmd.scm (host-name-service, nscd-service, mingetty-service,
syslog-service, guix-service, static-networking-service): Rewrite as
monadic functions.
(dmd-configuration-file): Use 'text-file' instead of
'add-text-to-store'.
* gnu/system/grub.scm (grub-configuration-file): Rewrite as a monadic
function.
* gnu/system/linux.scm (pam-services->directory): Likewise.
* gnu/system/shadow.scm (group-file, passwd-file, guix-build-accounts):
Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image,
union, system-qemu-image): Likewise.
2013-10-03 19:30:30 +00:00
|
|
|
|
(define* (qemu-image #:key
|
2013-02-16 02:28:26 +00:00
|
|
|
|
(name "qemu-image")
|
|
|
|
|
(system (%current-system))
|
2019-08-21 07:19:58 +00:00
|
|
|
|
(target (%current-target-system))
|
2015-11-20 23:34:32 +00:00
|
|
|
|
(qemu qemu-minimal)
|
2017-06-29 22:04:38 +00:00
|
|
|
|
(disk-image-size 'guess)
|
2014-05-22 20:30:13 +00:00
|
|
|
|
(disk-image-format "qcow2")
|
2014-05-03 10:16:10 +00:00
|
|
|
|
(file-system-type "ext4")
|
2014-05-29 21:07:43 +00:00
|
|
|
|
file-system-label
|
2017-09-06 21:12:32 +00:00
|
|
|
|
file-system-uuid
|
2018-11-16 08:05:45 +00:00
|
|
|
|
os
|
2017-05-09 08:52:02 +00:00
|
|
|
|
bootcfg-drv
|
|
|
|
|
bootloader
|
2019-04-16 21:15:02 +00:00
|
|
|
|
(register-closures? (has-guix-service-type? os))
|
2014-05-15 20:55:14 +00:00
|
|
|
|
(inputs '())
|
|
|
|
|
copy-inputs?)
|
2014-05-22 20:30:13 +00:00
|
|
|
|
"Return a bootable, stand-alone QEMU image of type DISK-IMAGE-FORMAT (e.g.,
|
2014-05-29 21:07:43 +00:00
|
|
|
|
'qcow2' or 'raw'), with a root partition of type FILE-SYSTEM-TYPE.
|
|
|
|
|
Optionally, FILE-SYSTEM-LABEL can be specified as the volume name for the root
|
2017-09-06 21:12:32 +00:00
|
|
|
|
partition; likewise FILE-SYSTEM-UUID, if true, specifies the UUID of the root
|
|
|
|
|
partition (a UUID object).
|
|
|
|
|
|
|
|
|
|
The returned image is a full disk image that runs OS-DERIVATION,
|
2014-06-27 15:54:29 +00:00
|
|
|
|
with a GRUB installation that uses GRUB-CONFIGURATION as its configuration
|
|
|
|
|
file (GRUB-CONFIGURATION must be the name of a file in the VM.)
|
2013-08-31 21:01:56 +00:00
|
|
|
|
|
2014-05-15 20:55:14 +00:00
|
|
|
|
INPUTS is a list of inputs (as for packages). When COPY-INPUTS? is true, copy
|
|
|
|
|
all of INPUTS into the image being built. When REGISTER-CLOSURES? is true,
|
|
|
|
|
register INPUTS in the store database of the image so that Guix can be used in
|
2019-04-16 21:15:02 +00:00
|
|
|
|
the image. By default, REGISTER-CLOSURES? is set to true only if a service of
|
|
|
|
|
type GUIX-SERVICE-TYPE is present in the services definition of the operating
|
|
|
|
|
system."
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(define schema
|
|
|
|
|
(and register-closures?
|
|
|
|
|
(local-file (search-path %load-path
|
|
|
|
|
"guix/store/schema.sql"))))
|
|
|
|
|
|
2014-09-06 13:45:32 +00:00
|
|
|
|
(expression->derivation-in-linux-vm
|
|
|
|
|
name
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
(with-extensions gcrypt-sqlite3&co
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(with-imported-modules `(,@(source-module-closure '((gnu build vm)
|
|
|
|
|
(gnu build bootloader)
|
|
|
|
|
(guix store database)
|
|
|
|
|
(guix build utils))
|
|
|
|
|
#:select? not-config?)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
((guix config) => ,(make-config.scm)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (gnu build bootloader)
|
|
|
|
|
(gnu build vm)
|
|
|
|
|
(guix store database)
|
|
|
|
|
(guix build utils)
|
|
|
|
|
(srfi srfi-26)
|
|
|
|
|
(ice-9 binary-ports))
|
|
|
|
|
|
|
|
|
|
(sql-schema #$schema)
|
|
|
|
|
|
2019-05-01 19:11:22 +00:00
|
|
|
|
;; 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")
|
|
|
|
|
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(let ((inputs
|
2019-08-21 07:19:58 +00:00
|
|
|
|
'#$(append (list parted e2fsprogs dosfstools)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(map canonical-package
|
|
|
|
|
(list sed grep coreutils findutils gawk))))
|
|
|
|
|
|
|
|
|
|
;; This variable is unused but allows us to add INPUTS-TO-COPY
|
|
|
|
|
;; as inputs.
|
|
|
|
|
(to-register
|
|
|
|
|
'#$(map (match-lambda
|
|
|
|
|
((name thing) thing)
|
|
|
|
|
((name thing output) `(,thing ,output)))
|
|
|
|
|
inputs)))
|
|
|
|
|
|
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)
|
|
|
|
|
|
|
|
|
|
(let* ((graphs '#$(match inputs
|
|
|
|
|
(((names . _) ...)
|
|
|
|
|
names)))
|
|
|
|
|
(initialize (root-partition-initializer
|
|
|
|
|
#:closures graphs
|
|
|
|
|
#:copy-closures? #$copy-inputs?
|
|
|
|
|
#:register-closures? #$register-closures?
|
2018-11-16 08:05:45 +00:00
|
|
|
|
#:system-directory #$os
|
2018-09-23 21:29:31 +00:00
|
|
|
|
|
|
|
|
|
;; Disable deduplication to speed things up,
|
|
|
|
|
;; and because it doesn't help much for a
|
|
|
|
|
;; single system generation.
|
|
|
|
|
#:deduplicate? #f))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(root-size #$(if (eq? 'guess disk-image-size)
|
|
|
|
|
#~(max
|
|
|
|
|
;; Minimum 20 MiB root size
|
|
|
|
|
(* 20 (expt 2 20))
|
|
|
|
|
(estimated-partition-size
|
|
|
|
|
(map (cut string-append "/xchg/" <>)
|
|
|
|
|
graphs)))
|
|
|
|
|
(- disk-image-size
|
|
|
|
|
(* 50 (expt 2 20)))))
|
|
|
|
|
(partitions
|
|
|
|
|
(append
|
|
|
|
|
(list (partition
|
|
|
|
|
(size root-size)
|
|
|
|
|
(label #$file-system-label)
|
|
|
|
|
(uuid #$(and=> file-system-uuid
|
|
|
|
|
uuid-bytevector))
|
|
|
|
|
(file-system #$file-system-type)
|
|
|
|
|
(flags '(boot))
|
|
|
|
|
(initializer initialize)))
|
|
|
|
|
;; Append a small EFI System Partition for use with UEFI
|
|
|
|
|
;; bootloaders if we are not targeting ARM because UEFI
|
|
|
|
|
;; support in U-Boot is experimental.
|
|
|
|
|
;;
|
2019-08-20 16:00:40 +00:00
|
|
|
|
;; FIXME: ‘target-arm?’ may be not operate on the right
|
2018-06-06 21:58:18 +00:00
|
|
|
|
;; system/target values. Rewrite using ‘let-system’ when
|
|
|
|
|
;; available.
|
2019-08-20 16:00:40 +00:00
|
|
|
|
(if #$(target-arm?)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
'()
|
|
|
|
|
(list (partition
|
|
|
|
|
;; The standalone grub image is about 10MiB, but
|
|
|
|
|
;; leave some room for custom or multiple images.
|
|
|
|
|
(size (* 40 (expt 2 20)))
|
|
|
|
|
(label "GNU-ESP") ;cosmetic only
|
|
|
|
|
;; Use "vfat" here since this property is used
|
|
|
|
|
;; when mounting. The actual FAT-ness is based
|
|
|
|
|
;; on file system size (16 in this case).
|
|
|
|
|
(file-system "vfat")
|
2019-08-20 16:00:40 +00:00
|
|
|
|
(flags '(esp)))))))
|
|
|
|
|
(grub-efi #$(and (not (target-arm?)) grub-efi)))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(initialize-hard-disk "/dev/vda"
|
|
|
|
|
#:partitions partitions
|
2019-08-20 16:00:40 +00:00
|
|
|
|
#:grub-efi grub-efi
|
2018-06-06 21:58:18 +00:00
|
|
|
|
#:bootloader-package
|
|
|
|
|
#$(bootloader-package bootloader)
|
|
|
|
|
#:bootcfg #$bootcfg-drv
|
|
|
|
|
#:bootcfg-location
|
|
|
|
|
#$(bootloader-configuration-file bootloader)
|
|
|
|
|
#:bootloader-installer
|
|
|
|
|
#$(bootloader-installer bootloader)))))))
|
2014-09-06 13:45:32 +00:00
|
|
|
|
#:system system
|
2019-08-21 07:19:58 +00:00
|
|
|
|
#:target target
|
2014-09-06 13:45:32 +00:00
|
|
|
|
#:make-disk-image? #t
|
|
|
|
|
#:disk-image-size disk-image-size
|
|
|
|
|
#:disk-image-format disk-image-format
|
|
|
|
|
#:references-graphs inputs))
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
2018-02-19 04:45:03 +00:00
|
|
|
|
(define* (system-docker-image os
|
|
|
|
|
#:key
|
2019-05-12 10:21:48 +00:00
|
|
|
|
(name "guix-docker-image")
|
2019-04-16 21:15:02 +00:00
|
|
|
|
(register-closures? (has-guix-service-type? os)))
|
2018-02-19 04:45:03 +00:00
|
|
|
|
"Build a docker image. OS is the desired <operating-system>. NAME is the
|
2019-04-16 21:15:02 +00:00
|
|
|
|
base name to use for the output file. When REGISTER-CLOSURES? is true,
|
|
|
|
|
register the closure of OS with Guix in the resulting Docker image. By
|
|
|
|
|
default, REGISTER-CLOSURES? is set to true only if a service of type
|
|
|
|
|
GUIX-SERVICE-TYPE is present in the services definition of the operating
|
|
|
|
|
system."
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(define schema
|
|
|
|
|
(and register-closures?
|
|
|
|
|
(local-file (search-path %load-path
|
|
|
|
|
"guix/store/schema.sql"))))
|
2018-05-28 21:42:28 +00:00
|
|
|
|
|
2019-05-12 10:21:48 +00:00
|
|
|
|
(define boot-program
|
|
|
|
|
;; Program that runs the boot script of OS, which in turn starts shepherd.
|
|
|
|
|
(program-file "boot-program"
|
|
|
|
|
#~(let ((system (cadr (command-line))))
|
|
|
|
|
(setenv "GUIX_NEW_SYSTEM" system)
|
|
|
|
|
(execl #$(file-append guile-2.2 "/bin/guile")
|
|
|
|
|
"guile" "--no-auto-compile"
|
|
|
|
|
(string-append system "/boot")))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(let ((os (operating-system-with-gc-roots
|
|
|
|
|
(containerized-operating-system os '())
|
|
|
|
|
(list boot-program)))
|
2019-03-22 16:48:37 +00:00
|
|
|
|
(name (string-append name ".tar.gz"))
|
|
|
|
|
(graph "system-graph"))
|
2018-02-19 04:45:03 +00:00
|
|
|
|
(define build
|
2019-07-21 21:05:54 +00:00
|
|
|
|
(with-extensions (cons guile-json-3 ;for (guix docker)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
gcrypt-sqlite3&co) ;for (guix store database)
|
2018-05-28 21:42:28 +00:00
|
|
|
|
(with-imported-modules `(,@(source-module-closure
|
|
|
|
|
'((guix docker)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(guix store database)
|
2018-05-28 21:42:28 +00:00
|
|
|
|
(guix build utils)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(guix build store-copy)
|
2018-05-28 21:42:28 +00:00
|
|
|
|
(gnu build vm))
|
|
|
|
|
#:select? not-config?)
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
|
((guix config) => ,(make-config.scm)))
|
2018-05-28 21:42:28 +00:00
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix docker)
|
|
|
|
|
(guix build utils)
|
|
|
|
|
(gnu build vm)
|
|
|
|
|
(srfi srfi-19)
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(guix build store-copy)
|
|
|
|
|
(guix store database))
|
|
|
|
|
|
|
|
|
|
;; Set the SQL schema location.
|
|
|
|
|
(sql-schema #$schema)
|
2018-05-28 21:42:28 +00:00
|
|
|
|
|
2019-06-17 08:51:49 +00:00
|
|
|
|
;; 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")
|
|
|
|
|
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(let* (;; This initializer requires elevated privileges that are
|
2018-05-28 21:42:28 +00:00
|
|
|
|
;; not normally available in the build environment (e.g.,
|
|
|
|
|
;; it needs to create device nodes). In order to obtain
|
|
|
|
|
;; such privileges, we run it as root in a VM.
|
|
|
|
|
(initialize (root-partition-initializer
|
|
|
|
|
#:closures '(#$graph)
|
|
|
|
|
#:register-closures? #$register-closures?
|
2019-03-22 16:48:37 +00:00
|
|
|
|
#:system-directory #$os
|
2018-05-28 21:42:28 +00:00
|
|
|
|
;; De-duplication would fail due to
|
|
|
|
|
;; cross-device link errors, so don't do it.
|
|
|
|
|
#:deduplicate? #f))
|
|
|
|
|
;; Even as root in a VM, the initializer would fail due to
|
|
|
|
|
;; lack of privileges if we use a root-directory that is on
|
|
|
|
|
;; a file system that is shared with the host (e.g., /tmp).
|
|
|
|
|
(root-directory "/guixsd-system-root"))
|
2018-06-06 21:58:18 +00:00
|
|
|
|
(set-path-environment-variable "PATH" '("bin" "sbin") '(#+tar))
|
2018-05-28 21:42:28 +00:00
|
|
|
|
(mkdir root-directory)
|
|
|
|
|
(initialize root-directory)
|
|
|
|
|
(build-docker-image
|
|
|
|
|
(string-append "/xchg/" #$name) ;; The output file.
|
|
|
|
|
(cons* root-directory
|
2018-06-04 20:06:34 +00:00
|
|
|
|
(map store-info-item
|
|
|
|
|
(call-with-input-file
|
|
|
|
|
(string-append "/xchg/" #$graph)
|
|
|
|
|
read-reference-graph)))
|
2019-03-22 16:48:37 +00:00
|
|
|
|
#$os
|
2019-05-12 10:21:48 +00:00
|
|
|
|
#:entry-point '(#$boot-program #$os)
|
2018-05-28 21:42:28 +00:00
|
|
|
|
#:compressor '(#+(file-append gzip "/bin/gzip") "-9n")
|
|
|
|
|
#:creation-time (make-time time-utc 0 1)
|
2019-04-14 15:03:34 +00:00
|
|
|
|
#:transformations `((,root-directory -> ""))))))))
|
2019-05-12 10:21:48 +00:00
|
|
|
|
|
2018-02-19 04:45:03 +00:00
|
|
|
|
(expression->derivation-in-linux-vm
|
2018-06-06 21:11:18 +00:00
|
|
|
|
name build
|
2018-02-19 04:45:03 +00:00
|
|
|
|
#:make-disk-image? #f
|
|
|
|
|
#:single-file-output? #t
|
2019-03-22 16:48:37 +00:00
|
|
|
|
#:references-graphs `((,graph ,os)))))
|
2018-02-19 04:45:03 +00:00
|
|
|
|
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
2014-05-22 21:12:36 +00:00
|
|
|
|
;;; VM and disk images.
|
2013-02-16 02:28:26 +00:00
|
|
|
|
;;;
|
|
|
|
|
|
2017-09-06 21:16:09 +00:00
|
|
|
|
(define* (operating-system-uuid os #:optional (type 'dce))
|
|
|
|
|
"Compute UUID object with a deterministic \"UUID\" for OS, of the given
|
|
|
|
|
TYPE (one of 'iso9660 or 'dce). Return a UUID object."
|
2018-09-07 07:50:26 +00:00
|
|
|
|
;; Note: For this to be deterministic, we must not hash things that contains
|
|
|
|
|
;; (directly or indirectly) procedures, for example. That rules out
|
|
|
|
|
;; anything that contains gexps, thunk or delayed record fields, etc.
|
|
|
|
|
|
|
|
|
|
(define service-name
|
|
|
|
|
(compose service-type-name service-kind))
|
|
|
|
|
|
|
|
|
|
(define (file-system-digest fs)
|
|
|
|
|
;; Return a hashable digest that does not contain 'dependencies' since
|
|
|
|
|
;; this field can contain procedures.
|
|
|
|
|
(let ((device (file-system-device fs)))
|
|
|
|
|
(list (file-system-mount-point fs)
|
|
|
|
|
(file-system-type fs)
|
|
|
|
|
(cond ((file-system-label? device)
|
|
|
|
|
(file-system-label->string device))
|
|
|
|
|
((uuid? device)
|
|
|
|
|
(uuid->string device))
|
|
|
|
|
((string? device)
|
|
|
|
|
device)
|
|
|
|
|
(else #f))
|
|
|
|
|
(file-system-options fs))))
|
|
|
|
|
|
2017-09-06 21:16:09 +00:00
|
|
|
|
(if (eq? type 'iso9660)
|
|
|
|
|
(let ((pad (compose (cut string-pad <> 2 #\0)
|
|
|
|
|
number->string))
|
2018-09-07 07:50:26 +00:00
|
|
|
|
(h (hash (map service-name (operating-system-services os))
|
|
|
|
|
3600)))
|
2017-09-06 21:16:09 +00:00
|
|
|
|
(bytevector->uuid
|
|
|
|
|
(string->iso9660-uuid
|
|
|
|
|
(string-append "1970-01-01-"
|
|
|
|
|
(pad (hash (operating-system-host-name os) 24)) "-"
|
|
|
|
|
(pad (quotient h 60)) "-"
|
|
|
|
|
(pad (modulo h 60)) "-"
|
2018-09-07 07:50:26 +00:00
|
|
|
|
(pad (hash (map file-system-digest
|
|
|
|
|
(operating-system-file-systems os))
|
|
|
|
|
100))))
|
2017-09-06 21:16:09 +00:00
|
|
|
|
'iso9660))
|
|
|
|
|
(bytevector->uuid
|
|
|
|
|
(uint-list->bytevector
|
|
|
|
|
(list (hash file-system-type
|
2017-11-03 12:40:07 +00:00
|
|
|
|
(- (expt 2 32) 1))
|
2017-09-06 21:16:09 +00:00
|
|
|
|
(hash (operating-system-host-name os)
|
2017-11-03 12:40:07 +00:00
|
|
|
|
(- (expt 2 32) 1))
|
2018-09-07 07:50:26 +00:00
|
|
|
|
(hash (map service-name (operating-system-services os))
|
2017-11-03 12:40:07 +00:00
|
|
|
|
(- (expt 2 32) 1))
|
2018-09-07 07:50:26 +00:00
|
|
|
|
(hash (map file-system-digest (operating-system-file-systems os))
|
2017-11-03 12:40:07 +00:00
|
|
|
|
(- (expt 2 32) 1)))
|
2017-09-06 21:16:09 +00:00
|
|
|
|
(endianness little)
|
|
|
|
|
4)
|
|
|
|
|
type)))
|
|
|
|
|
|
2014-05-22 21:12:36 +00:00
|
|
|
|
(define* (system-disk-image os
|
|
|
|
|
#:key
|
2014-06-04 14:07:37 +00:00
|
|
|
|
(name "disk-image")
|
2014-05-22 21:12:36 +00:00
|
|
|
|
(file-system-type "ext4")
|
|
|
|
|
(disk-image-size (* 900 (expt 2 20)))
|
|
|
|
|
(volatile? #t))
|
|
|
|
|
"Return the derivation of a disk image of DISK-IMAGE-SIZE bytes of the
|
|
|
|
|
system described by OS. Said image can be copied on a USB stick as is. When
|
|
|
|
|
VOLATILE? is true, the root file system is made volatile; this is useful
|
|
|
|
|
to USB sticks meant to be read-only."
|
2017-07-10 01:23:30 +00:00
|
|
|
|
(define normalize-label
|
|
|
|
|
;; ISO labels are all-caps (case-insensitive), but since
|
|
|
|
|
;; 'find-partition-by-label' is case-sensitive, make it all-caps here.
|
|
|
|
|
(if (string=? "iso9660" file-system-type)
|
|
|
|
|
string-upcase
|
|
|
|
|
identity))
|
2017-09-06 21:16:09 +00:00
|
|
|
|
|
2014-05-30 21:45:42 +00:00
|
|
|
|
(define root-label
|
2017-09-06 21:16:09 +00:00
|
|
|
|
;; Volume name of the root file system.
|
2019-03-13 15:44:02 +00:00
|
|
|
|
(normalize-label "Guix_image"))
|
2014-05-30 21:45:42 +00:00
|
|
|
|
|
2019-04-24 19:56:03 +00:00
|
|
|
|
(define (root-uuid os)
|
2017-09-06 21:16:09 +00:00
|
|
|
|
;; UUID of the root file system, computed in a deterministic fashion.
|
|
|
|
|
;; This is what we use to locate the root file system so it has to be
|
|
|
|
|
;; different from the user's own file system UUIDs.
|
|
|
|
|
(operating-system-uuid os
|
|
|
|
|
(if (string=? file-system-type "iso9660")
|
|
|
|
|
'iso9660
|
|
|
|
|
'dce)))
|
|
|
|
|
|
2014-05-22 21:12:36 +00:00
|
|
|
|
(define file-systems-to-keep
|
|
|
|
|
(remove (lambda (fs)
|
|
|
|
|
(string=? (file-system-mount-point fs) "/"))
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(let* ((os (operating-system (inherit os)
|
|
|
|
|
;; Since this is meant to be used on real hardware, don't
|
|
|
|
|
;; install QEMU networking or anything like that. Assume USB
|
|
|
|
|
;; mass storage devices (usb-storage.ko) are available.
|
|
|
|
|
(initrd (lambda (file-systems . rest)
|
|
|
|
|
(apply (operating-system-initrd os)
|
|
|
|
|
file-systems
|
2019-11-18 04:54:32 +00:00
|
|
|
|
#:volatile-root? volatile?
|
2018-11-16 08:05:45 +00:00
|
|
|
|
rest)))
|
|
|
|
|
|
|
|
|
|
(bootloader (if (string=? "iso9660" file-system-type)
|
|
|
|
|
(bootloader-configuration
|
|
|
|
|
(inherit (operating-system-bootloader os))
|
|
|
|
|
(bootloader grub-mkrescue-bootloader))
|
|
|
|
|
(operating-system-bootloader os)))
|
|
|
|
|
|
2019-04-24 19:56:03 +00:00
|
|
|
|
;; Force our own root file system. (We need a "/" file system
|
|
|
|
|
;; to call 'root-uuid'.)
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(file-systems (cons (file-system
|
|
|
|
|
(mount-point "/")
|
2019-04-24 19:56:03 +00:00
|
|
|
|
(device "/dev/placeholder")
|
|
|
|
|
(type file-system-type))
|
|
|
|
|
file-systems-to-keep))))
|
|
|
|
|
(uuid (root-uuid os))
|
|
|
|
|
(os (operating-system
|
|
|
|
|
(inherit os)
|
|
|
|
|
(file-systems (cons (file-system
|
|
|
|
|
(mount-point "/")
|
|
|
|
|
(device uuid)
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(type file-system-type))
|
|
|
|
|
file-systems-to-keep))))
|
|
|
|
|
(bootcfg (operating-system-bootcfg os)))
|
|
|
|
|
(if (string=? "iso9660" file-system-type)
|
|
|
|
|
(iso9660-image #:name name
|
|
|
|
|
#:file-system-label root-label
|
2019-04-24 19:56:03 +00:00
|
|
|
|
#:file-system-uuid uuid
|
2018-11-16 08:05:45 +00:00
|
|
|
|
#:os os
|
|
|
|
|
#:bootcfg-drv bootcfg
|
|
|
|
|
#:bootloader (bootloader-configuration-bootloader
|
|
|
|
|
(operating-system-bootloader os))
|
|
|
|
|
#:inputs `(("system" ,os)
|
2019-05-18 15:49:05 +00:00
|
|
|
|
("bootcfg" ,bootcfg))
|
|
|
|
|
#:grub-mkrescue-environment
|
|
|
|
|
'(("MKRESCUE_SED_MODE" . "mbr_hfs")))
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(qemu-image #:name name
|
|
|
|
|
#:os os
|
|
|
|
|
#:bootcfg-drv bootcfg
|
|
|
|
|
#:bootloader (bootloader-configuration-bootloader
|
|
|
|
|
(operating-system-bootloader os))
|
|
|
|
|
#:disk-image-size disk-image-size
|
|
|
|
|
#:disk-image-format "raw"
|
|
|
|
|
#:file-system-type file-system-type
|
|
|
|
|
#:file-system-label root-label
|
2019-04-24 19:56:03 +00:00
|
|
|
|
#:file-system-uuid uuid
|
2018-11-16 08:05:45 +00:00
|
|
|
|
#:copy-inputs? #t
|
|
|
|
|
#:inputs `(("system" ,os)
|
|
|
|
|
("bootcfg" ,bootcfg))))))
|
2014-05-22 21:12:36 +00:00
|
|
|
|
|
2014-02-19 20:10:12 +00:00
|
|
|
|
(define* (system-qemu-image os
|
2014-05-03 10:45:43 +00:00
|
|
|
|
#:key
|
|
|
|
|
(file-system-type "ext4")
|
|
|
|
|
(disk-image-size (* 900 (expt 2 20))))
|
|
|
|
|
"Return the derivation of a freestanding QEMU image of DISK-IMAGE-SIZE bytes
|
|
|
|
|
of the GNU system as described by OS."
|
2014-05-14 21:15:51 +00:00
|
|
|
|
(define file-systems-to-keep
|
|
|
|
|
;; Keep only file systems other than root and not normally bound to real
|
|
|
|
|
;; devices.
|
|
|
|
|
(remove (lambda (fs)
|
|
|
|
|
(let ((target (file-system-mount-point fs))
|
|
|
|
|
(source (file-system-device fs)))
|
|
|
|
|
(or (string=? target "/")
|
|
|
|
|
(string-prefix? "/dev/" source))))
|
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2018-01-07 14:06:36 +00:00
|
|
|
|
(define root-uuid
|
|
|
|
|
;; UUID of the root file system.
|
|
|
|
|
(operating-system-uuid os
|
|
|
|
|
(if (string=? file-system-type "iso9660")
|
|
|
|
|
'iso9660
|
|
|
|
|
'dce)))
|
|
|
|
|
|
|
|
|
|
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(let* ((os (operating-system (inherit os)
|
|
|
|
|
;; Assume we have an initrd with the whole QEMU shebang.
|
|
|
|
|
|
|
|
|
|
;; Force our own root file system. Refer to it by UUID so that
|
|
|
|
|
;; it works regardless of how the image is used ("qemu -hda",
|
|
|
|
|
;; Xen, etc.).
|
|
|
|
|
(file-systems (cons (file-system
|
|
|
|
|
(mount-point "/")
|
|
|
|
|
(device root-uuid)
|
|
|
|
|
(type file-system-type))
|
|
|
|
|
file-systems-to-keep))))
|
|
|
|
|
(bootcfg (operating-system-bootcfg os)))
|
|
|
|
|
(qemu-image #:os os
|
|
|
|
|
#:bootcfg-drv bootcfg
|
|
|
|
|
#:bootloader (bootloader-configuration-bootloader
|
|
|
|
|
(operating-system-bootloader os))
|
|
|
|
|
#:disk-image-size disk-image-size
|
|
|
|
|
#:file-system-type file-system-type
|
|
|
|
|
#:file-system-uuid root-uuid
|
|
|
|
|
#:inputs `(("system" ,os)
|
|
|
|
|
("bootcfg" ,bootcfg))
|
|
|
|
|
#:copy-inputs? #t)))
|
2013-02-16 02:28:26 +00:00
|
|
|
|
|
2014-11-20 22:32:54 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; VMs that share file systems with the host.
|
|
|
|
|
;;;
|
|
|
|
|
|
2014-11-20 21:48:18 +00:00
|
|
|
|
(define (file-system->mount-tag fs)
|
|
|
|
|
"Return a 9p mount tag for host file system FS."
|
2018-03-08 10:55:06 +00:00
|
|
|
|
;; QEMU mount tags must be ASCII, at most 31-byte long, cannot contain
|
|
|
|
|
;; slashes, and cannot start with '_'. Compute an identifier that
|
|
|
|
|
;; corresponds to the rules.
|
2014-11-20 21:48:18 +00:00
|
|
|
|
(string-append "TAG"
|
2018-03-08 10:55:06 +00:00
|
|
|
|
(string-drop (bytevector->base32-string
|
|
|
|
|
(sha1 (string->utf8 fs)))
|
|
|
|
|
4)))
|
2014-11-20 21:48:18 +00:00
|
|
|
|
|
2014-11-20 22:32:54 +00:00
|
|
|
|
(define (mapping->file-system mapping)
|
|
|
|
|
"Return a 9p file system that realizes MAPPING."
|
|
|
|
|
(match mapping
|
|
|
|
|
(($ <file-system-mapping> source target writable?)
|
|
|
|
|
(file-system
|
|
|
|
|
(mount-point target)
|
|
|
|
|
(device (file-system->mount-tag source))
|
|
|
|
|
(type "9p")
|
|
|
|
|
(flags (if writable? '() '(read-only)))
|
2017-12-09 08:36:52 +00:00
|
|
|
|
(options "trans=virtio,cache=loose")
|
2014-11-20 22:32:54 +00:00
|
|
|
|
(check? #f)
|
|
|
|
|
(create-mount-point? #t)))))
|
|
|
|
|
|
2017-02-14 15:28:33 +00:00
|
|
|
|
(define* (virtualized-operating-system os mappings #:optional (full-boot? #f))
|
2014-05-02 22:26:07 +00:00
|
|
|
|
"Return an operating system based on OS suitable for use in a virtualized
|
2014-11-20 22:32:54 +00:00
|
|
|
|
environment with the store shared with the host. MAPPINGS is a list of
|
|
|
|
|
<file-system-mapping> to realize in the virtualized OS."
|
|
|
|
|
(define user-file-systems
|
|
|
|
|
;; Remove file systems that conflict with those added below, or that are
|
|
|
|
|
;; normally bound to real devices.
|
|
|
|
|
(remove (lambda (fs)
|
|
|
|
|
(let ((target (file-system-mount-point fs))
|
|
|
|
|
(source (file-system-device fs)))
|
|
|
|
|
(or (string=? target (%store-prefix))
|
|
|
|
|
(string=? target "/")
|
2018-05-18 11:43:07 +00:00
|
|
|
|
(and (string? source)
|
2017-11-30 15:14:12 +00:00
|
|
|
|
(string-prefix? "/dev/" source))
|
|
|
|
|
|
|
|
|
|
;; Labels and UUIDs are necessarily invalid in the VM.
|
|
|
|
|
(and (file-system-mount? fs)
|
2018-05-18 11:43:07 +00:00
|
|
|
|
(or (file-system-label? source)
|
2017-11-30 15:14:12 +00:00
|
|
|
|
(uuid? source))))))
|
2014-11-20 22:32:54 +00:00
|
|
|
|
(operating-system-file-systems os)))
|
|
|
|
|
|
2017-02-14 15:28:33 +00:00
|
|
|
|
(define virtual-file-systems
|
|
|
|
|
(cons (file-system
|
|
|
|
|
(mount-point "/")
|
|
|
|
|
(device "/dev/vda1")
|
|
|
|
|
(type "ext4"))
|
|
|
|
|
|
|
|
|
|
(append (map mapping->file-system mappings)
|
|
|
|
|
user-file-systems)))
|
|
|
|
|
|
2014-05-02 22:26:07 +00:00
|
|
|
|
(operating-system (inherit os)
|
2017-10-19 21:11:36 +00:00
|
|
|
|
|
|
|
|
|
;; XXX: Until we run QEMU with UEFI support (with the OVMF firmware),
|
|
|
|
|
;; force the traditional i386/BIOS method.
|
|
|
|
|
;; See <https://bugs.gnu.org/28768>.
|
|
|
|
|
(bootloader (bootloader-configuration
|
2019-03-19 21:53:48 +00:00
|
|
|
|
(inherit (operating-system-bootloader os))
|
2017-10-19 21:11:36 +00:00
|
|
|
|
(bootloader grub-bootloader)
|
|
|
|
|
(target "/dev/vda")))
|
|
|
|
|
|
2014-09-22 19:29:41 +00:00
|
|
|
|
(initrd (lambda (file-systems . rest)
|
2017-11-24 16:35:12 +00:00
|
|
|
|
(apply (operating-system-initrd os)
|
|
|
|
|
file-systems
|
2014-09-22 19:29:41 +00:00
|
|
|
|
#:volatile-root? #t
|
|
|
|
|
rest)))
|
2014-11-05 08:25:59 +00:00
|
|
|
|
|
|
|
|
|
;; Disable swap.
|
|
|
|
|
(swap-devices '())
|
|
|
|
|
|
2017-02-14 15:28:33 +00:00
|
|
|
|
;; XXX: When FULL-BOOT? is true, do not add a 9p mount for /gnu/store
|
|
|
|
|
;; since that would lead the bootloader config to look for the kernel and
|
|
|
|
|
;; initrd in it.
|
|
|
|
|
(file-systems (if full-boot?
|
|
|
|
|
virtual-file-systems
|
|
|
|
|
(cons
|
|
|
|
|
(file-system
|
|
|
|
|
(inherit (mapping->file-system %store-mapping))
|
|
|
|
|
(needed-for-boot? #t))
|
|
|
|
|
virtual-file-systems)))))
|
2014-05-02 22:26:07 +00:00
|
|
|
|
|
2014-01-31 13:36:48 +00:00
|
|
|
|
(define* (system-qemu-image/shared-store
|
2014-02-19 20:10:12 +00:00
|
|
|
|
os
|
2014-11-08 13:49:13 +00:00
|
|
|
|
#:key
|
|
|
|
|
full-boot?
|
2016-04-28 21:04:52 +00:00
|
|
|
|
(disk-image-size (* (if full-boot? 500 30) (expt 2 20))))
|
2014-01-31 13:36:48 +00:00
|
|
|
|
"Return a derivation that builds a QEMU image of OS that shares its store
|
2014-11-08 13:49:13 +00:00
|
|
|
|
with the host.
|
|
|
|
|
|
|
|
|
|
When FULL-BOOT? is true, return an image that does a complete boot sequence,
|
|
|
|
|
bootloaded included; thus, make a disk image that contains everything the
|
|
|
|
|
bootloader refers to: OS kernel, initrd, bootloader data, etc."
|
2018-05-22 15:36:35 +00:00
|
|
|
|
(define root-uuid
|
|
|
|
|
;; Use a fixed UUID to improve determinism.
|
|
|
|
|
(operating-system-uuid os 'dce))
|
|
|
|
|
|
2018-11-16 08:05:45 +00:00
|
|
|
|
(define bootcfg
|
|
|
|
|
(operating-system-bootcfg os))
|
|
|
|
|
|
|
|
|
|
;; XXX: When FULL-BOOT? is true, we end up creating an image that contains
|
|
|
|
|
;; BOOTCFG and all its dependencies, including the output of OS.
|
|
|
|
|
;; This is more than needed (we only need the kernel, initrd, GRUB for its
|
|
|
|
|
;; font, and the background image), but it's hard to filter that.
|
|
|
|
|
(qemu-image #:os os
|
|
|
|
|
#:bootcfg-drv bootcfg
|
|
|
|
|
#:bootloader (bootloader-configuration-bootloader
|
|
|
|
|
(operating-system-bootloader os))
|
|
|
|
|
#:disk-image-size disk-image-size
|
|
|
|
|
#:file-system-uuid root-uuid
|
|
|
|
|
#:inputs (if full-boot?
|
|
|
|
|
`(("bootcfg" ,bootcfg))
|
|
|
|
|
'())
|
|
|
|
|
|
|
|
|
|
;; XXX: Passing #t here is too slow, so let it off by default.
|
|
|
|
|
#:register-closures? #f
|
|
|
|
|
#:copy-inputs? full-boot?))
|
2014-01-31 13:36:48 +00:00
|
|
|
|
|
2014-11-20 21:48:18 +00:00
|
|
|
|
(define* (common-qemu-options image shared-fs)
|
|
|
|
|
"Return the a string-value gexp with the common QEMU options to boot IMAGE,
|
|
|
|
|
with '-virtfs' options for the host file systems listed in SHARED-FS."
|
2017-02-14 15:28:32 +00:00
|
|
|
|
|
2014-11-20 21:48:18 +00:00
|
|
|
|
(define (virtfs-option fs)
|
2017-02-14 15:28:32 +00:00
|
|
|
|
#~(format #f "-virtfs local,path=~s,security_model=none,mount_tag=~s"
|
|
|
|
|
#$fs #$(file-system->mount-tag fs)))
|
2014-11-20 21:48:18 +00:00
|
|
|
|
|
2017-02-14 15:28:32 +00:00
|
|
|
|
#~(;; Only enable kvm if we see /dev/kvm exists.
|
2016-02-22 19:23:14 +00:00
|
|
|
|
;; This allows users without hardware virtualization to still use these
|
|
|
|
|
;; commands.
|
2017-02-14 15:28:32 +00:00
|
|
|
|
#$@(if (file-exists? "/dev/kvm")
|
|
|
|
|
'("-enable-kvm")
|
|
|
|
|
'())
|
|
|
|
|
|
|
|
|
|
"-no-reboot"
|
|
|
|
|
"-net nic,model=virtio"
|
2017-12-03 01:17:45 +00:00
|
|
|
|
"-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng"
|
|
|
|
|
"-device" "virtio-rng-pci,rng=guixsd-vm-rng"
|
2017-02-14 15:28:32 +00:00
|
|
|
|
|
|
|
|
|
#$@(map virtfs-option shared-fs)
|
|
|
|
|
"-vga std"
|
|
|
|
|
(format #f "-drive file=~a,if=virtio,cache=writeback,werror=report,readonly"
|
2017-06-15 17:22:00 +00:00
|
|
|
|
#$image)))
|
2014-11-06 21:58:12 +00:00
|
|
|
|
|
2014-11-07 21:43:33 +00:00
|
|
|
|
(define* (system-qemu-image/shared-store-script os
|
|
|
|
|
#:key
|
|
|
|
|
(qemu qemu)
|
|
|
|
|
(graphic? #t)
|
2017-06-15 17:22:00 +00:00
|
|
|
|
(memory-size 256)
|
2014-11-20 22:32:54 +00:00
|
|
|
|
(mappings '())
|
2014-11-08 13:49:13 +00:00
|
|
|
|
full-boot?
|
|
|
|
|
(disk-image-size
|
2017-05-20 19:28:20 +00:00
|
|
|
|
(* (if full-boot? 500 70)
|
2017-07-18 08:36:21 +00:00
|
|
|
|
(expt 2 20)))
|
|
|
|
|
(options '()))
|
2014-01-31 13:36:48 +00:00
|
|
|
|
"Return a derivation that builds a script to run a virtual machine image of
|
2017-06-15 17:22:00 +00:00
|
|
|
|
OS that shares its store with the host. The virtual machine runs with
|
|
|
|
|
MEMORY-SIZE MiB of memory.
|
2014-11-08 13:49:13 +00:00
|
|
|
|
|
2014-11-20 22:32:54 +00:00
|
|
|
|
MAPPINGS is a list of <file-system-mapping> specifying mapping of host file
|
|
|
|
|
systems into the guest.
|
|
|
|
|
|
2014-11-08 13:49:13 +00:00
|
|
|
|
When FULL-BOOT? is true, the returned script runs everything starting from the
|
|
|
|
|
bootloader; otherwise it directly starts the operating system kernel. The
|
|
|
|
|
DISK-IMAGE-SIZE parameter specifies the size in bytes of the root disk image;
|
|
|
|
|
it is mostly useful when FULL-BOOT? is true."
|
2017-02-14 15:28:33 +00:00
|
|
|
|
(mlet* %store-monad ((os -> (virtualized-operating-system os mappings full-boot?))
|
2014-11-08 13:49:13 +00:00
|
|
|
|
(image (system-qemu-image/shared-store
|
|
|
|
|
os
|
|
|
|
|
#:full-boot? full-boot?
|
|
|
|
|
#:disk-image-size disk-image-size)))
|
2017-02-14 15:28:32 +00:00
|
|
|
|
(define kernel-arguments
|
2017-04-21 12:37:11 +00:00
|
|
|
|
#~(list #$@(if graphic? #~() #~("console=ttyS0"))
|
2018-11-15 13:36:16 +00:00
|
|
|
|
#+@(operating-system-kernel-arguments os "/dev/vda1")))
|
2017-02-14 15:28:32 +00:00
|
|
|
|
|
|
|
|
|
(define qemu-exec
|
|
|
|
|
#~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system)))
|
|
|
|
|
#$@(if full-boot?
|
|
|
|
|
#~()
|
|
|
|
|
#~("-kernel" #$(operating-system-kernel-file os)
|
2018-11-15 13:36:16 +00:00
|
|
|
|
"-initrd" #$(file-append os "/initrd")
|
2017-02-14 15:28:32 +00:00
|
|
|
|
(format #f "-append ~s"
|
|
|
|
|
(string-join #$kernel-arguments " "))))
|
|
|
|
|
#$@(common-qemu-options image
|
|
|
|
|
(map file-system-mapping-source
|
2017-06-15 17:22:00 +00:00
|
|
|
|
(cons %store-mapping mappings)))
|
2017-07-18 08:36:21 +00:00
|
|
|
|
"-m " (number->string #$memory-size)
|
|
|
|
|
#$@options))
|
2017-02-14 15:28:32 +00:00
|
|
|
|
|
2014-01-31 13:36:48 +00:00
|
|
|
|
(define builder
|
2014-04-26 14:36:48 +00:00
|
|
|
|
#~(call-with-output-file #$output
|
|
|
|
|
(lambda (port)
|
2017-02-14 15:28:32 +00:00
|
|
|
|
(format port "#!~a~% exec ~a \"$@\"~%"
|
|
|
|
|
#$(file-append bash "/bin/sh")
|
|
|
|
|
(string-join #$qemu-exec " "))
|
2014-04-26 14:36:48 +00:00
|
|
|
|
(chmod port #o555))))
|
|
|
|
|
|
|
|
|
|
(gexp->derivation "run-vm.sh" builder)))
|
2014-01-31 13:36:48 +00:00
|
|
|
|
|
2017-07-18 08:36:21 +00:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; High-level abstraction.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <virtual-machine> %virtual-machine
|
|
|
|
|
make-virtual-machine
|
|
|
|
|
virtual-machine?
|
|
|
|
|
(operating-system virtual-machine-operating-system) ;<operating-system>
|
|
|
|
|
(qemu virtual-machine-qemu ;<package>
|
|
|
|
|
(default qemu))
|
|
|
|
|
(graphic? virtual-machine-graphic? ;Boolean
|
|
|
|
|
(default #f))
|
|
|
|
|
(memory-size virtual-machine-memory-size ;integer (MiB)
|
|
|
|
|
(default 256))
|
2017-09-28 17:57:18 +00:00
|
|
|
|
(disk-image-size virtual-machine-disk-image-size ;integer (bytes)
|
|
|
|
|
(default 'guess))
|
2017-07-18 08:36:21 +00:00
|
|
|
|
(port-forwardings virtual-machine-port-forwardings ;list of integer pairs
|
|
|
|
|
(default '())))
|
|
|
|
|
|
|
|
|
|
(define-syntax virtual-machine
|
|
|
|
|
(syntax-rules ()
|
|
|
|
|
"Declare a virtual machine running the specified OS, with the given
|
|
|
|
|
options."
|
|
|
|
|
((_ os) ;shortcut
|
|
|
|
|
(%virtual-machine (operating-system os)))
|
|
|
|
|
((_ fields ...)
|
|
|
|
|
(%virtual-machine fields ...))))
|
|
|
|
|
|
|
|
|
|
(define (port-forwardings->qemu-options forwardings)
|
|
|
|
|
"Return the QEMU option for the given port FORWARDINGS as a string, where
|
|
|
|
|
FORWARDINGS is a list of host-port/guest-port pairs."
|
|
|
|
|
(string-join
|
|
|
|
|
(map (match-lambda
|
|
|
|
|
((host-port . guest-port)
|
|
|
|
|
(string-append "hostfwd=tcp::"
|
|
|
|
|
(number->string host-port)
|
|
|
|
|
"-:" (number->string guest-port))))
|
|
|
|
|
forwardings)
|
|
|
|
|
","))
|
|
|
|
|
|
|
|
|
|
(define-gexp-compiler (virtual-machine-compiler (vm <virtual-machine>)
|
|
|
|
|
system target)
|
|
|
|
|
;; XXX: SYSTEM and TARGET are ignored.
|
|
|
|
|
(match vm
|
2017-09-28 17:57:18 +00:00
|
|
|
|
(($ <virtual-machine> os qemu graphic? memory-size disk-image-size ())
|
2017-07-18 08:36:21 +00:00
|
|
|
|
(system-qemu-image/shared-store-script os
|
|
|
|
|
#:qemu qemu
|
|
|
|
|
#:graphic? graphic?
|
2017-09-28 17:57:18 +00:00
|
|
|
|
#:memory-size memory-size
|
|
|
|
|
#:disk-image-size
|
|
|
|
|
disk-image-size))
|
|
|
|
|
(($ <virtual-machine> os qemu graphic? memory-size disk-image-size
|
|
|
|
|
forwardings)
|
2017-07-18 08:36:21 +00:00
|
|
|
|
(let ((options
|
|
|
|
|
`("-net" ,(string-append
|
|
|
|
|
"user,"
|
|
|
|
|
(port-forwardings->qemu-options forwardings)))))
|
|
|
|
|
(system-qemu-image/shared-store-script os
|
|
|
|
|
#:qemu qemu
|
|
|
|
|
#:graphic? graphic?
|
|
|
|
|
#:memory-size memory-size
|
2017-09-28 17:57:18 +00:00
|
|
|
|
#:disk-image-size
|
|
|
|
|
disk-image-size
|
2017-07-18 08:36:21 +00:00
|
|
|
|
#:options options)))))
|
|
|
|
|
|
2013-02-16 02:28:26 +00:00
|
|
|
|
;;; vm.scm ends here
|