summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-15 11:31:26 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-15 11:31:26 +0000
commit35e4310946f1d4d335c9eefae91a0bf2c3d73704 (patch)
treed55b96d873367f83918696a0f101d4b65526b113
parent6523c60a6e918d982ac378beef48e0d3dfa0603e (diff)
downloaddefinitions-35e4310946f1d4d335c9eefae91a0bf2c3d73704.tar.gz
Add scratchbox2 and QEMU to the devel system (x86_64 only for now)
Note that this makes the devel system image huge again. It may well be worth making this a separate devel-system-x86_64-cross or some such.
-rw-r--r--strata/tools.morph4
-rw-r--r--systems/devel-system-x86_64-generic.morph2
2 files changed, 6 insertions, 0 deletions
diff --git a/strata/tools.morph b/strata/tools.morph
index c7842f87..7102f180 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -170,3 +170,7 @@ chunks:
ref: a4769dc7999b53260325fb89945bef85714fb338
unpetrify-ref: baserock/morph
build-depends: []
+- name: scratchbox2
+ repo: git://gitorious.org/scratchbox2/scratchbox2.git
+ ref: 173e4b7081bb5f5965ca90bee037231ab4e88c64
+ build-depends: []
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index bf5a7f45..870b5ac4 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/openstack-clients.morph
- name: cloudinit-support
morph: strata/cloudinit-support.morph
+- name: virtualization
+ morph: strata/virtualization.morph
configuration-extensions:
- set-hostname
- add-config-files