summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2015-04-03 07:50:19 (GMT)
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2015-04-03 07:50:50 (GMT)
commit657d70dcca8494b16d02f06a1600784047906101 (patch)
tree445a89dedf15de734303bc3f4bc355d9138511b1
parenta459c78d170f5c8bc469229425e036f4c3302e95 (diff)
downloaddefinitions-baserock/ps/make-uniques.tar.gz
Make some chunks and strata uniquebaserock/ps/make-uniques
Change-Id: I01a4c4d324630cfd4f619086935d5c0f5fd11e73
-rw-r--r--chef-system-x86_64-container.morph2
-rw-r--r--strata/ansible.morph2
-rw-r--r--strata/ansible/ansible.morph2
-rw-r--r--strata/baserock-import.morph2
-rw-r--r--strata/foundation/acl.morph1
-rw-r--r--strata/lorry.morph2
-rw-r--r--strata/swift.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph4
8 files changed, 9 insertions, 8 deletions
diff --git a/chef-system-x86_64-container.morph b/chef-system-x86_64-container.morph
index 3e81c73..8bf9ac9 100644
--- a/chef-system-x86_64-container.morph
+++ b/chef-system-x86_64-container.morph
@@ -22,7 +22,7 @@ strata:
morph: strata/foundation.morph
artifacts:
- foundation-runtime
-- name: ruby
+- name: ruby-common
morph: strata/ruby.morph
artifacts:
- ruby-runtime
diff --git a/strata/ansible.morph b/strata/ansible.morph
index 4af0e80..b14adf3 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -5,7 +5,7 @@ build-depends:
- morph: strata/core.morph
- morph: strata/python-common.morph
chunks:
-- name: ansible
+- name: ansible-chunk
morph: strata/ansible/ansible.morph
repo: upstream:ansible
ref: 0a7124541247cc613352054f4bc0c3e116e0b657
diff --git a/strata/ansible/ansible.morph b/strata/ansible/ansible.morph
index dbc6ec4..b93d2d0 100644
--- a/strata/ansible/ansible.morph
+++ b/strata/ansible/ansible.morph
@@ -1,4 +1,4 @@
-name: ansible
+name: ansible-chunk
kind: chunk
build-system: python-distutils
post-install-commands:
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
index c086110..051cfe1 100644
--- a/strata/baserock-import.morph
+++ b/strata/baserock-import.morph
@@ -21,7 +21,7 @@ chunks:
repo: upstream:python-packages/requests-cache
ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf
unpetrify-ref: 0.4.6
-- name: baserock-import
+- name: baserock-import-chunk
repo: baserock:baserock/import
ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7
unpetrify-ref: master
diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph
index 4489f5d..1ee280a 100644
--- a/strata/foundation/acl.morph
+++ b/strata/foundation/acl.morph
@@ -1,4 +1,5 @@
name: acl
kind: chunk
+max-jobs: 1
install-commands:
- make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/lorry.morph b/strata/lorry.morph
index b3a0c77..7e57990 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -1,4 +1,4 @@
-name: lorry
+name: lorry-common
kind: stratum
description: |
Lorry and tools for working with version control systems other than Git.
diff --git a/strata/swift.morph b/strata/swift.morph
index 641485b..9e976a6 100644
--- a/strata/swift.morph
+++ b/strata/swift.morph
@@ -31,7 +31,7 @@ chunks:
repo: upstream:python-packages/xattr
ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc
unpetrify-ref: v0.7.6
-- name: swift
+- name: swift-chunk
repo: upstream:openstack/swift
ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b
unpetrify-ref: 2.2.0
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 82fc0ca..f37ed0e 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -30,9 +30,9 @@ strata:
morph: strata/cloudinit-support.morph
- name: nodejs
morph: strata/nodejs.morph
-- name: ruby
+- name: ruby-common
morph: strata/ruby.morph
-- name: lorry
+- name: lorry-common
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph