From 657d70dcca8494b16d02f06a1600784047906101 Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Fri, 3 Apr 2015 07:50:19 +0000
Subject: Make some chunks and strata unique

Change-Id: I01a4c4d324630cfd4f619086935d5c0f5fd11e73
---
 chef-system-x86_64-container.morph        | 2 +-
 strata/ansible.morph                      | 2 +-
 strata/ansible/ansible.morph              | 2 +-
 strata/baserock-import.morph              | 2 +-
 strata/foundation/acl.morph               | 1 +
 strata/lorry.morph                        | 2 +-
 strata/swift.morph                        | 2 +-
 systems/devel-system-x86_64-generic.morph | 4 ++--
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/chef-system-x86_64-container.morph b/chef-system-x86_64-container.morph
index 3e81c73e..8bf9ac9b 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 4af0e805..b14adf3c 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 dbc6ec4b..b93d2d04 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 c0861105..051cfe1b 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 4489f5d5..1ee280ad 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 b3a0c779..7e57990c 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 641485b3..9e976a65 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 82fc0cae..f37ed0e6 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
-- 
cgit v1.2.1