rump kernels: ts-rumprun-bake: Do not tolerate errors

If we skip due to missing the input pieces, make the warning noiser.

If we think we have all the input pieces, bomb out if they don't seem
to contain the right bits, or if rumpbake fails.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/ts-rumprun-bake b/ts-rumprun-bake
index d79d6f825e83e32a086304959ae691e130dbb817..31ce2590647036203c0b861188025ce2a5d25eaf 100755 (executable)
--- a/ts-rumprun-bake
+++ b/ts-rumprun-bake
@@ -61,15 +61,14 @@ sub bakeimage ($$) {
            ($ho, "rumpbake-n-$name", $execpart, $buildjob || $job);
     };
     if ($@) {
-       warn "skipping: $@";
+       logm "*** WARNING: skipping $name: $@";
        return;
     }
     my $execfile = $execdist.$execpath;
 
     target_cmd_build($ho, 1000, $imagesdir, <<END);
-        if test -f $execfile; then
-            $rumpbake xen_pv $name $execfile
-        fi
+        ls -al $execfile
+        $rumpbake xen_pv $name $execfile
 END
 }
 
@@ -81,9 +80,8 @@ while (@ARGV) {
     die unless @ARGV>=2;
     my $name = shift @ARGV;
     my $rumpexec = shift @ARGV;
-    eval {
-       bakeimage($name,$rumpexec);
-    };
+
+    bakeimage($name,$rumpexec);
 }
 
 stash();