convert-cabinet-layout: wip ARM

diff --git a/convert-cabinet-layout b/convert-cabinet-layout
index 82246d02fec7b7474ef2f5870062376cbb94c045..9a49ae6d3f3f15466a3424dc1890964692478f15 100755 (executable)
--- a/convert-cabinet-layout
+++ b/convert-cabinet-layout
@@ -26,9 +26,7 @@ open DEBUG, ">/dev/null";
 our $only;
 our $createlike;
 
-our @flags = qw(arch-amd64 arch-i386 arch-xen-amd64 arch-xen-i386
-                hvm purpose-build purpose-test
-                suite-wheezy);
+our @flags = qw(purpose-build purpose-test suite-wheezy);
 
 while (@ARGV && $ARGV[0] =~ m/^-/) {
     $_ = shift @ARGV;
@@ -128,7 +126,18 @@ while (my $row = csv_row()) {
         my $kind = $1;
         $machine = $1.$2;
         my $kindhvm = $kindhvm{$kind} or die "$kind ?";
+        push @hflags, qw(arch-amd64 arch-i386 arch-xen-amd64 arch-xen-i386);
+        push @hflags, qw(hvm);
         push @hflags, "equiv-$kind", "hvm-$kindhvm";
+    } elsif ($machine =~ m/^ARM-(\w+)-(\w+)$/) {
+        my $kind = lc $1;
+        $machine = (lc $1).(lc $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";
+        if ($kind eq 'arndale') {
+            push @hflags, 'force-mac-address';
+        }
     } else {
         next;
     }