From dbb542f32e6e0546c138adc8ad9d257d58c11bcc Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 3 May 2012 16:00:33 +0100 Subject: Use explicit repo name prefixes --- tests.as-root/make-patch.script | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests.as-root/make-patch.script') diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 873aa049..0151ef6c 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -46,12 +46,12 @@ cat < "$DATADIR/morphs-repo/hello-stratum.morph" "sources": [ { "name": "hello", - "repo": "chunk-repo", + "repo": "test:chunk-repo", "ref": "farrokh" }, { "name": "linux", - "repo": "kernel-repo", + "repo": "test:kernel-repo", "ref": "master" } ] @@ -61,7 +61,7 @@ EOF > /dev/null # Build first image. Remember the stratum. -"$SRCDIR/scripts/test-morph" build morphs-repo master hello-system.morph +"$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-system.morph img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*') stratum1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.stratum.*') @@ -80,15 +80,15 @@ sed -i 's/farrokh/alfred/' "$DATADIR/morphs-repo/hello-stratum.morph" > /dev/null # Build second image. -"$SRCDIR/scripts/test-morph" build morphs-repo alfred hello-system.morph +"$SRCDIR/scripts/test-morph" build test:morphs-repo alfred hello-system.morph img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \ ! -name $(basename "$img1")) # Make the patch. patch="$DATADIR/patch" "$SRCDIR/scripts/test-morph" make-patch "$patch" \ - morphs-repo master hello-system.morph \ - morphs-repo alfred hello-system.morph + test:morphs-repo master hello-system.morph \ + test:morphs-repo alfred hello-system.morph # Unpack the original stratum and run the program. mkdir "$DATADIR/unpacked" -- cgit v1.2.1