summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-20 13:22:26 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-20 13:22:26 (GMT)
commit93e4acab1be695c402ab2335843af408a3446006 (patch)
tree668d1afa23f17632d5873e8d506f270f8484bbc6
parent87df3c1fca6771141fd045785e8118289e6503d6 (diff)
parentb56462082d9216db0403dac0e6c1833d4d29b4be (diff)
downloaddefinitions-93e4acab1be695c402ab2335843af408a3446006.tar.gz
Merge branch 'baserock/richardipsum/pip-v2'
Reviewed by: Adam Coldrick <adam.coldrick@codethink.co.uk> (v1) Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--strata/core.morph6
-rw-r--r--strata/python-tools.morph12
-rw-r--r--strata/webtools.morph7
-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
20 files changed, 50 insertions, 9 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 0a8122f..37133fe 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -279,9 +279,9 @@ chunks:
- texinfo-tarball
- name: python-setuptools
morph: strata/core/python-setuptools.morph
- repo: upstream:python-setuptools
- ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77
- unpetrify-ref: baserock/morph
+ repo: upstream:python-setuptools-bitbucket
+ ref: 0aa6a4de5931d02876428388678802db2371fd37
+ unpetrify-ref: baserock/master
build-depends:
- cpython
- name: pyyaml
diff --git a/strata/python-tools.morph b/strata/python-tools.morph
new file mode 100644
index 0000000..8b82c77
--- /dev/null
+++ b/strata/python-tools.morph
@@ -0,0 +1,12 @@
+name: python-tools
+kind: stratum
+description: "A stratum for non-essential python tools:
+useful python tools that we don't want to include in core."
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: pip
+ repo: upstream:pip
+ ref: d4b691b743a91500cf49119d28a805db8313f129
+ unpetrify-ref: master
+ build-depends: []
diff --git a/strata/webtools.morph b/strata/webtools.morph
index 8df32e9..3917574 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.morph
@@ -1,6 +1,6 @@
name: webtools
kind: stratum
-description: pip, node and other fun things
+description: web things
build-depends:
- morph: strata/tools.morph
- morph: strata/pcre-utils.morph
@@ -22,11 +22,6 @@ chunks:
ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
unpetrify-ref: baserock/release_1_28
build-depends: []
-- name: pip
- repo: upstream:pip.git
- ref: d4b691b743a91500cf49119d28a805db8313f129
- unpetrify-ref: master
- build-depends: []
- name: nginx
morph: strata/webtools/nginx.morph
repo: upstream:nginx
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 40c0731..466df31 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 f34d397..ed11138 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 7ad8cac..6b24e60 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 6abba89..70c6f1c 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index ad3a145..1f5bf1c 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -21,6 +21,8 @@ strata:
morph: strata/openstack-clients.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 6804c7f..7e70313 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -24,6 +24,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 5e04376..0235801 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 2532802..8fe3737 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 1ee4581..550c361 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 92674a2..9e8f0bc 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index ddfd1f2..a60f35f 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 8aeaf26..6f7fd31 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -28,6 +28,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index a54eef5..52e6484 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -29,6 +29,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 ef5d4b9..8d484e8 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -32,6 +32,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 84d63f5..e77aa5d 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -29,6 +29,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.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 9334fca..143ceb8 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -32,6 +32,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index f2f849c..a7731ca 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-tools
+ morph: strata/python-tools.morph
configuration-extensions:
- set-hostname
- add-config-files