From 2a071ef057c953e81e1b8bd9b714373b4dbb26c2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 28 Aug 2012 17:20:04 +0100 Subject: 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. --- tests.branching/setup | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests.branching/setup') 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 < "$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 < "$DATADIR/morphs/hello-stratum.morph" "chunks": [ { "name": "hello", - "ref": "master", "repo": "baserock:hello", + "ref": "master", "build-depends": [] } ] -- cgit v1.2.1