diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2013-09-23 13:19:57 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2013-09-25 14:54:27 +0000 |
| commit | dd12caa40f2b614c2fc4757be9a62bf532598568 (patch) | |
| tree | 2260dc2034c4fb7570206c12f23a72b1105fd1e5 | |
| parent | 636101995ac698adff0d046f9eb7e0afb294b604 (diff) | |
| download | definitions-dd12caa40f2b614c2fc4757be9a62bf532598568.tar.gz | |
Move pyyaml from 'tools' to 'core'.
Also moved python-setuptools because is a dependency of pyyaml. Pyyaml
is moved to core because is a dependency of 'cloudinit-support' stratum
and moving it give us the capacity of buid base systems with cloduinit.
core.morph: added pyyaml and python-setuptools
tools.morph: deleted pyyaml and python-setuptools
cross-bootstrap.morph: deleted pyyaml and python-setuptools
| -rw-r--r-- | core.morph | 10 | ||||
| -rw-r--r-- | cross-bootstrap.morph | 13 | ||||
| -rw-r--r-- | tools.morph | 13 |
3 files changed, 12 insertions, 24 deletions
@@ -192,3 +192,13 @@ chunks: build-depends: - flex - texinfo-tarball +- name: python-setuptools + repo: upstream:python-setuptools + ref: baserock/morph + build-depends: + - cpython +- name: pyyaml + repo: upstream:pyyaml + ref: baserock/morph + build-depends: + - python-setuptools diff --git a/cross-bootstrap.morph b/cross-bootstrap.morph index 8eaf0251..b9c3cf68 100644 --- a/cross-bootstrap.morph +++ b/cross-bootstrap.morph @@ -15,24 +15,14 @@ chunks: ref: baserock/morph build-depends: - groff -- name: python-setuptools - repo: upstream:python-setuptools - ref: baserock/morph - build-depends: [] - name: python-ttystatus repo: upstream:python-ttystatus ref: baserock/morph build-depends: [] -- name: pyyaml - repo: upstream:pyyaml - ref: baserock/morph - build-depends: - - python-setuptools - name: python-coveragepy repo: upstream:python-coveragepy ref: baserock/morph - build-depends: - - python-setuptools + build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: baserock/morph @@ -65,7 +55,6 @@ chunks: - cliapp - cmdtest - python-coverage-test-runner - - pyyaml - name: rsync repo: upstream:rsync ref: baserock/morph diff --git a/tools.morph b/tools.morph index 5acecc49..c60581b7 100644 --- a/tools.morph +++ b/tools.morph @@ -10,24 +10,14 @@ chunks: repo: upstream:patch ref: baserock/morph build-depends: [] -- name: python-setuptools - repo: upstream:python-setuptools - ref: baserock/morph - build-depends: [] - name: python-ttystatus repo: upstream:python-ttystatus ref: baserock/morph build-depends: [] -- name: pyyaml - repo: upstream:pyyaml - ref: baserock/morph - build-depends: - - python-setuptools - name: python-coveragepy repo: upstream:python-coveragepy ref: baserock/morph - build-depends: - - python-setuptools + build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: baserock/morph @@ -89,7 +79,6 @@ chunks: - cliapp - cmdtest - python-coverage-test-runner - - pyyaml - name: pv repo: upstream:pv ref: baserock/morph |