diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-01 13:47:03 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-05 12:00:40 +0000 |
commit | e02c0d120f1615f1eb9e3c4f45294e01f11fe98e (patch) | |
tree | 798ea78e4adc6269d65b315e268eadd73ce7dff3 | |
parent | adac44f6248996d0d45d0bb87af3a689122f7027 (diff) | |
download | morphs-e02c0d120f1615f1eb9e3c4f45294e01f11fe98e.tar.gz |
Move Morph from 'foundation' back to 'tools'
Morph isn't necessary for a Baserock base system and shouldn't ever be.
-rw-r--r-- | foundation.morph | 64 | ||||
-rw-r--r-- | tools.morph | 64 |
2 files changed, 64 insertions, 64 deletions
diff --git a/foundation.morph b/foundation.morph index 1a5b53f..1ed1a15 100644 --- a/foundation.morph +++ b/foundation.morph @@ -55,26 +55,6 @@ "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": "usbutils", "repo": "upstream:usbutils", "ref": "baserock/morph", @@ -105,14 +85,6 @@ ] }, { - "name": "python-coveragepy", - "repo": "upstream:python-coveragepy", - "ref": "baserock/morph", - "build-depends": [ - "python-setuptools" - ] - }, - { "name": "dbus-pre", "repo": "upstream:dbus", "ref": "baserock/build-essential", @@ -121,14 +93,6 @@ ] }, { - "name": "python-coverage-test-runner", - "repo": "upstream:python-coverage-test-runner", - "ref": "baserock/morph", - "build-depends": [ - "python-coveragepy" - ] - }, - { "name": "systemd", "repo": "upstream:systemd", "ref": "baserock/morph", @@ -143,23 +107,6 @@ ] }, { - "name": "cliapp", - "repo": "upstream:cliapp", - "ref": "trunk", - "build-depends": [ - "python-coverage-test-runner" - ] - }, - { - "name": "cmdtest", - "repo": "upstream:cmdtest", - "ref": "baserock/morph", - "build-depends": [ - "cliapp", - "python-ttystatus" - ] - }, - { "name": "btrfs-progs", "repo": "upstream:btrfs-progs", "ref": "baserock/morph", @@ -196,17 +143,6 @@ "build-depends": [] }, { - "name": "morph", - "repo": "baserock:baserock/morph", - "ref": "master", - "build-depends": [ - "cliapp", - "cmdtest", - "python-coverage-test-runner", - "pyyaml" - ] - }, - { "name": "openssh", "repo": "upstream:openssh", "ref": "baserock/morph", diff --git a/tools.morph b/tools.morph index ffbacec..5e7eaf4 100644 --- a/tools.morph +++ b/tools.morph @@ -23,6 +23,59 @@ "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" + ] + }, + { + "name": "python-coverage-test-runner", + "repo": "upstream:python-coverage-test-runner", + "ref": "baserock/morph", + "build-depends": [ + "python-coveragepy" + ] + }, + { + "name": "cliapp", + "repo": "upstream:cliapp", + "ref": "trunk", + "build-depends": [ + "python-coverage-test-runner" + ] + }, + { + "name": "cmdtest", + "repo": "upstream:cmdtest", + "ref": "baserock/morph", + "build-depends": [ + "cliapp", + "python-ttystatus" + ] + }, + { "name": "cmake", "repo": "upstream:cmake", "ref": "master", @@ -75,6 +128,17 @@ "build-depends": [] }, { + "name": "morph", + "repo": "baserock:baserock/morph", + "ref": "master", + "build-depends": [ + "cliapp", + "cmdtest", + "python-coverage-test-runner", + "pyyaml" + ] + }, + { "name": "pv", "repo": "upstream:pv", "ref": "master", |