From 4e37fdf5adbf4d25561b472b4089b6782c599f93 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Sep 2012 18:05:56 +0100 Subject: Don't require .morph in triplet arguments This gives us consistency with morphologies, where the triplets are repo|ref|morphology, not repo|ref|filename Anyone who runs 'morph build baserock:morphs master system.morph' will now see an error ending with 'was looking for system.morph.morph', which should make it clear where they have gone wrong. --- tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script') diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 803ffe53..c20efff5 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -85,7 +85,7 @@ git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' "$SRCDIR/scripts/test-morph" \ - build-morphology test:morphs-repo custom system.morph > /dev/null + build-morphology test:morphs-repo custom system > /dev/null for suffix in kernel rootfs do -- cgit v1.2.1