summaryrefslogtreecommitdiff
path: root/systems/devel-system-armv7lhf-highbank.morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 11:26:31 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 11:26:31 +0000
commit796141cc16becc5a682082feebd67fd2ebf2d7af (patch)
treea7219bcf7ef0deea0977dbfc31556d9369ad9cc6 /systems/devel-system-armv7lhf-highbank.morph
parent2b28b4d3aee6d9e21341132df241c1d7cb3c94e0 (diff)
parent15fddc5547bdf091783724bfb43ce518fbe35d9b (diff)
downloaddefinitions-796141cc16becc5a682082feebd67fd2ebf2d7af.tar.gz
Merge branch 'baserock/sam/import'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk> Conflicts: systems/devel-system-armv7-highbank.morph systems/devel-system-armv7-versatile.morph systems/devel-system-armv7-wandboard.morph systems/devel-system-armv7b-highbank.morph systems/devel-system-armv7lhf-highbank.morph systems/devel-system-armv7lhf-wandboard.morph systems/devel-system-ppc64-generic.morph systems/devel-system-x86_32-generic.morph systems/devel-system-x86_64-generic.morph
Diffstat (limited to 'systems/devel-system-armv7lhf-highbank.morph')
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
1 files changed, 2 insertions, 0 deletions
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 53277b89..d83c46a0 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
configuration-extensions: