summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hoinkis <simon.hoinkis@codethink.co.uk>2015-02-25 14:45:18 (GMT)
committerSimon Hoinkis <simon.hoinkis@codethink.co.uk>2015-02-25 16:38:27 (GMT)
commit2756249d64f4062d35e8695d6a6cc15a7ec3e298 (patch)
treee840ec18f515389d1e6493b14be1b5115e8bf2ef
parenta7cec56a7e2c4d076580c517f88d114ea2be05d0 (diff)
downloaddefinitions-2756249d64f4062d35e8695d6a6cc15a7ec3e298.tar.gz
Clean up the Morph chunks in cross-bootstrap
and include morph-utils instead
-rw-r--r--strata/cross-bootstrap.morph53
-rw-r--r--strata/cross-bootstrap/cmdtest.morph6
-rw-r--r--strata/cross-bootstrap/pyfilesystem.morph6
-rw-r--r--strata/cross-bootstrap/python-coveragepy.morph6
-rw-r--r--strata/cross-bootstrap/python-ttystatus.morph6
-rw-r--r--systems/cross-bootstrap-system-armv7lhf-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-armv8l64-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-ppc64-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-x86_64-generic.morph2
9 files changed, 8 insertions, 77 deletions
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index be4f4db..3aa61ca 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -18,64 +18,11 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- groff
-- name: python-ttystatus
- morph: strata/cross-bootstrap/python-ttystatus.morph
- repo: upstream:python-ttystatus
- ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coveragepy
- morph: strata/cross-bootstrap/python-coveragepy.morph
- repo: upstream:python-coveragepy
- ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coverage-test-runner
- repo: upstream:python-coverage-test-runner
- ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coveragepy
-- name: cliapp
- repo: upstream:cliapp
- ref: cec20cedd062a3aef1b04f997e77b45090c07806
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coverage-test-runner
-- name: python-markdown
- repo: upstream:python-markdown
- ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cmdtest
- morph: strata/cross-bootstrap/cmdtest.morph
- repo: upstream:cmdtest
- ref: ac91791842c6e7e6eda3213916af413255999c7b
- unpetrify-ref: baserock/morph
- build-depends:
- - cliapp
- - python-ttystatus
- - python-markdown
- name: linux-user-chroot
repo: upstream:linux-user-chroot
ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
unpetrify-ref: baserock/morph
build-depends: []
-- name: pyfilesystem
- morph: strata/cross-bootstrap/pyfilesystem.morph
- repo: upstream:pyfilesystem
- ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: morph
- repo: baserock:baserock/morph
- ref: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c
- unpetrify-ref: master
- build-depends:
- - cliapp
- - cmdtest
- - python-coverage-test-runner
- - pyfilesystem
- name: rsync
morph: strata/cross-bootstrap/rsync.morph
repo: upstream:rsync
diff --git a/strata/cross-bootstrap/cmdtest.morph b/strata/cross-bootstrap/cmdtest.morph
deleted file mode 100644
index 3e1c71c..0000000
--- a/strata/cross-bootstrap/cmdtest.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: cmdtest
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/pyfilesystem.morph b/strata/cross-bootstrap/pyfilesystem.morph
deleted file mode 100644
index a4931df..0000000
--- a/strata/cross-bootstrap/pyfilesystem.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pyfilesystem
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/python-coveragepy.morph b/strata/cross-bootstrap/python-coveragepy.morph
deleted file mode 100644
index ed5e3d8..0000000
--- a/strata/cross-bootstrap/python-coveragepy.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-coveragepy
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/cross-bootstrap/python-ttystatus.morph b/strata/cross-bootstrap/python-ttystatus.morph
deleted file mode 100644
index e45ef7a..0000000
--- a/strata/cross-bootstrap/python-ttystatus.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-ttystatus
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
index 4eecf7f..23817c0 100644
--- a/systems/cross-bootstrap-system-armv7lhf-generic.morph
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph
@@ -7,5 +7,7 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: cross-bootstrap
morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph
index 30094e7..c35cff5 100644
--- a/systems/cross-bootstrap-system-armv8l64-generic.morph
+++ b/systems/cross-bootstrap-system-armv8l64-generic.morph
@@ -7,5 +7,7 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: cross-bootstrap
morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
index 8b274e8..40c80c0 100644
--- a/systems/cross-bootstrap-system-ppc64-generic.morph
+++ b/systems/cross-bootstrap-system-ppc64-generic.morph
@@ -7,5 +7,7 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: cross-bootstrap
morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
index bdd42cf..646a04d 100644
--- a/systems/cross-bootstrap-system-x86_64-generic.morph
+++ b/systems/cross-bootstrap-system-x86_64-generic.morph
@@ -7,5 +7,7 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: cross-bootstrap
morph: strata/cross-bootstrap.morph