summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 11:26:31 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-11-18 11:26:31 (GMT)
commit796141cc16becc5a682082feebd67fd2ebf2d7af (patch)
treea7219bcf7ef0deea0977dbfc31556d9369ad9cc6
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
-rw-r--r--strata/baserock-import.morph31
-rw-r--r--systems/devel-system-armv7-chroot.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7-versatile.morph2
-rw-r--r--systems/devel-system-armv7-wandboard.morph2
-rw-r--r--systems/devel-system-armv7b-chroot.morph2
-rw-r--r--systems/devel-system-armv7b-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph2
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph2
-rw-r--r--systems/devel-system-ppc64-chroot.morph2
-rw-r--r--systems/devel-system-ppc64-generic.morph2
-rw-r--r--systems/devel-system-x86_32-chroot.morph2
-rw-r--r--systems/devel-system-x86_32-generic.morph2
-rw-r--r--systems/devel-system-x86_64-chroot.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
18 files changed, 65 insertions, 0 deletions
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
new file mode 100644
index 0000000..6e875e8
--- /dev/null
+++ b/strata/baserock-import.morph
@@ -0,0 +1,31 @@
+name: baserock-import
+kind: stratum
+description: Tools for importing software into Baserock definitions.
+build-depends:
+- morph: strata/morph-utils.morph
+chunks:
+- name: ansicolor
+ repo: upstream:python-packages/ansicolor
+ ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef
+ unpetrify-ref: 0.2.4
+ build-depends: []
+- name: python-decorator
+ repo: upstream:python-packages/python-decorator
+ ref: b02f7a254c3679dfac57a824e08dd02ced850636
+ unpetrify-ref: decorator-3.4.0
+ build-depends: []
+- name: networkx
+ repo: upstream:python-packages/networkx
+ ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
+ unpetrify-ref: networkx-1.9.1
+ build-depends: []
+- name: requests-cache
+ repo: upstream:python-packages/requests-cache
+ ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf
+ unpetrify-ref: 0.4.6
+ build-depends: []
+- name: baserock-import
+ repo: baserock:baserock/import
+ ref: edd18a77973d8cd12b09bc6e3ac06fecd72a7e45
+ unpetrify-ref: master
+ build-depends: []
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 348e657..9d4de4d 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index dac00e2..a408b55 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -24,6 +24,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:
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index ff5077b..6e386a9 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -24,6 +24,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:
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 3599ddc..2797c00 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -24,6 +24,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:
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 78cd4c5..ad3a145 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 4ba469b..6804c7f 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -20,6 +20,8 @@ strata:
morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 314eb70..3cb9386 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 53277b8..d83c46a 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:
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 5d53288..736033d 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index bad1cde..859f8ad 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.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:
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 4a47e5d..804cf60 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -21,6 +21,8 @@ strata:
morph: strata/openstack-clients.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index bd6a02d..6a9cb09 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -22,6 +22,8 @@ strata:
morph: strata/openstack-clients.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
configuration-extensions:
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 626dc6f..4c882c2 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 6721a19..d6fb17e 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -26,6 +26,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:
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 550e436..65a5307 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 969f32b..5a16c90 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -26,6 +26,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:
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index cefe96c..413c5b5 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -26,6 +26,8 @@ strata:
morph: strata/nodejs.morph
- name: ruby
morph: strata/ruby.morph
+- name: baserock-import
+ morph: strata/baserock-import.morph
configuration-extensions:
- set-hostname
- add-config-files