Merge lp:~smoser/maas-images/trunk.lp1640519 into lp:maas-images

[Scott Moser]

Never add u-boot-tools to image on zesty or newer.

u-boot-tools was added to arm64 and armhf images as a crutch in order to
aid curtin in installation of older releases. In newer curtin this is
fixed by dynamic installation similar to how grub is handled.

See LP: #1640519 for more information.

[Lee Trager (ltrager)]

LGTM!

review: Approve

=== modified file 'bin/maas-cloudimg2ephemeral'
--- bin/maas-cloudimg2ephemeral	2016-09-23 19:00:56 +0000
+++ bin/maas-cloudimg2ephemeral	2016-11-29 16:19:53 +0000
@@ -297,9 +297,17 @@
             rel_pkgs="${rel_pkgs} maas-enlist";;
     esac
 
-    case "$arch" in
-        arm64|armhf) arch_pkgs="u-boot-tools";;
-    esac
+    change="add u-boot-tools to arch_pkgs for arch '$arch' (LP: #1640519)"
+    if [ "$arch" = "arm64" -o "$arch" = "armhf" ]; then
+        case "$release" in
+            precise|quantal|raring|saucy|trusty|utopic|vivid|wily|\
+            xenial|yakkety)
+                arch_pkgs="${arch_pkgs} u-boot-tools"
+                debug 1 "release '$release' <= yakkety: $change"
+                ;;
+            *) debug 1 "release '$release' > yakkety: do not $change";;
+        esac
+    fi
 
     local removes="^linux-.*" keeps="^linux-base$" pkglist=""
     pkglist=$(dpkg-query --show) || { error "failed dpkg-query"; return 1; }