summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-02-18 12:58:29 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2015-02-18 12:58:29 +0000
commitd4874875cad1f32e652e56622445f3dd439f1cf7 (patch)
treeefe135e585794d128299af563f83860ef970b208
parentd684564190e7a9abc65fe9a6f6614fd0a6c65fb7 (diff)
parente64e34ce23fd657e4e42a4baece5d24adad0d52c (diff)
downloaddefinitions-d4874875cad1f32e652e56622445f3dd439f1cf7.tar.gz
Merge branch 'baserock/james/weston-system-updates'
Reviewed by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed by: Javier Jardon <jjardon@gnome.org>
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph6
-rw-r--r--systems/weston-system-x86_64-generic.morph2
2 files changed, 8 insertions, 0 deletions
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index a51bd810..2e139755 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -33,6 +33,12 @@ strata:
morph: strata/mesa-common.morph
- name: weston-common
morph: strata/weston-common.morph
+- name: x-common
+ morph: strata/x-common.morph
+- name: x-generic
+ morph: strata/x-generic.morph
+- name: tools
+ morph: strata/tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index b84eaeb5..de099697 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -37,6 +37,8 @@ strata:
morph: strata/x-common.morph
- name: x-generic
morph: strata/x-generic.morph
+- name: tools
+ morph: strata/tools.morph
configuration-extensions:
- set-hostname
- add-config-files