From 2756249d64f4062d35e8695d6a6cc15a7ec3e298 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 25 Feb 2015 14:45:18 +0000 Subject: Clean up the Morph chunks in cross-bootstrap and include morph-utils instead --- strata/cross-bootstrap.morph | 53 ---------------------- strata/cross-bootstrap/cmdtest.morph | 6 --- strata/cross-bootstrap/pyfilesystem.morph | 6 --- strata/cross-bootstrap/python-coveragepy.morph | 6 --- strata/cross-bootstrap/python-ttystatus.morph | 6 --- .../cross-bootstrap-system-armv7lhf-generic.morph | 2 + .../cross-bootstrap-system-armv8l64-generic.morph | 2 + systems/cross-bootstrap-system-ppc64-generic.morph | 2 + .../cross-bootstrap-system-x86_64-generic.morph | 2 + 9 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 strata/cross-bootstrap/cmdtest.morph delete mode 100644 strata/cross-bootstrap/pyfilesystem.morph delete mode 100644 strata/cross-bootstrap/python-coveragepy.morph delete mode 100644 strata/cross-bootstrap/python-ttystatus.morph diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index be4f4db8..3aa61caf 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 3e1c71c6..00000000 --- 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 a4931dfa..00000000 --- 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 ed5e3d87..00000000 --- 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 e45ef7a8..00000000 --- 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 4eecf7fe..23817c0c 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 30094e74..c35cff5f 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 8b274e80..40c80c00 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 bdd42cf3..646a04d3 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 -- cgit v1.2.1