diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-28 17:20:04 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-08-30 11:19:01 +0000 |
| commit | 2a071ef057c953e81e1b8bd9b714373b4dbb26c2 (patch) | |
| tree | bffd06cb8a9d0c825cdc2274b7b4c55adc07def6 /tests.branching | |
| parent | ecefb2d1936221ccf21cbad6db2fe73cd229f4f5 (diff) | |
| download | morph-2a071ef057c953e81e1b8bd9b714373b4dbb26c2.tar.gz | |
Strata should be referred to with full repo/ref/morph triplets
This removes the requirement that all strata must be in the same
repo as the system morphology.
Both the system "strata" field and the stratum "build-depends" field
are affected.
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 4 | ||||
| -rwxr-xr-x | tests.branching/setup | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index e58e8187..01c67858 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,5 +1,5 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 06ae459..ad8c08b 100644 +index 006a96c..ad8c08b 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph @@ -1,12 +1,14 @@ @@ -10,8 +10,8 @@ index 06ae459..ad8c08b 100644 "chunks": [ { - "name": "hello", -- "ref": "master", - "repo": "baserock:hello", +- "ref": "master", - "build-depends": [] + "build-depends": [], + "morph": "hello", diff --git a/tests.branching/setup b/tests.branching/setup index b062f379..126714a0 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -63,7 +63,11 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" "system-kind": "syslinux-disk", "disk-size": "1G", "strata": [ - "hello-stratum" + { + "morph": "hello-stratum", + "repo": "baserock:hello", + "ref": "master" + } ] } EOF @@ -75,8 +79,8 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" "chunks": [ { "name": "hello", - "ref": "master", "repo": "baserock:hello", + "ref": "master", "build-depends": [] } ] |