move the snappy kernel builds to the correct linux-image-$arch and linux-firmware-$arch metapackages

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.405) UNRELEASED; urgency=medium
+
+  * move the snappy kernel builds to the correct linux-image-$arch and
+    linux-firmware-$arch metapackages
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 20 Apr 2016 19:34:11 +0200
+
 livecd-rootfs (2.404) xenial; urgency=medium
 
   * Follow linux-firmware-raspi2 renaming in the archive for raspi2 images.

live-build/auto/build

@@ -399,17 +399,20 @@ case $PROJECT:$SUBPROJECT in
         HERE="$(pwd)"
         set -x
 
-        linux_package="linux-$devarch"
+        linux_package="linux-image-$devarch"
         case $ARCH in
             amd64)
-              linux_package="linux-signed-generic"
+              linux_package="linux-signed-image-generic"
               ;;
             arm64)
               if [ "$devarch" = "dragonboard" ]; then
-                  # ugly hack til we have a metapackage
+                  linux_package="linux-image-snapdragon linux-firmware-snapdragon"
-                  linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware"
               fi
               ;;
+            armhf)
+              if [ "$devarch" = "raspi2" ]; then
+                  linux_package="linux-image-raspi2 linux-firmware-raspi2"
+              ;;
             ppc64el|s390x)
               echo "I: skipping kernel and device tarball for $ARCH"
               return