convert-cabinet-layout: ARM wip

diff --git a/convert-cabinet-layout b/convert-cabinet-layout
index 9a49ae6d3f3f15466a3424dc1890964692478f15..c52666421f002a683960f08739f040ca6954c556 100755 (executable)
--- a/convert-cabinet-layout
+++ b/convert-cabinet-layout
@@ -32,7 +32,9 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_ = shift @ARGV;
     last if m/^\-\-?$/;
     if (s/^--only=//) {
-        $only = $_;
+        $only //= "";
+        $only .= " ";
+        $only .= $_;
         next;
     }
     for (;;) {
@@ -131,7 +133,7 @@ while (my $row = csv_row()) {
         push @hflags, "equiv-$kind", "hvm-$kindhvm";
     } elsif ($machine =~ m/^ARM-(\w+)-(\w+)$/) {
         my $kind = lc $1;
-        $machine = (lc $1).(lc $2);
+        $machine = lc "$1-$2";
         push @hflags, qw(arch-armhf arch-xen-armhf);
         push @hflags, qw(need-kernel-deb-armmp no-di-kernel need-uboot-bootscr);
         push @hflags, "blessed-commission-$kind", "blessed-commission-$machine";