summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 18:07:01 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 18:07:01 (GMT)
commitf46b33f777d1afa46479bbd366ea6ae256686efa (patch)
tree29ba0820c5aab8115d02124616c01b65d308e376
parent1f18880def044dfb62a813b3da8dd782b21c3d77 (diff)
parent50ed8f535d7bc8ad7d9f690d0de52b453bedb10e (diff)
downloaddefinitions-f46b33f777d1afa46479bbd366ea6ae256686efa.tar.gz
Merge branch 'baserock/lauren/extlinux-in-build-systems'
Reviewed-By: James Thomas <james.thomas@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--systems/build-system-x86_32-chroot.morph2
-rw-r--r--systems/build-system-x86_32.morph2
-rw-r--r--systems/build-system-x86_64-chroot.morph2
-rw-r--r--systems/build-system-x86_64.morph2
4 files changed, 8 insertions, 0 deletions
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 6e2c201..33dad79 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/openstack-clients.morph
- name: devtools
morph: strata/devtools.morph
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 87cda46..019a0af 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/openstack-clients.morph
- name: devtools
morph: strata/devtools.morph
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index d8eeb7f..97b317a 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/openstack-clients.morph
- name: devtools
morph: strata/devtools.morph
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index cdfa65c..a255ba8 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/openstack-clients.morph
- name: devtools
morph: strata/devtools.morph
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools.morph
configuration-extensions:
- set-hostname
- add-config-files