From 8d145b4d43cb63505c0eefaf5da001188a161652 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 20 Apr 2016 19:35:55 +0200
Subject: [PATCH] move the snappy kernel builds to the correct
 linux-image-$arch and linux-firmware-$arch metapackages

---
 debian/changelog      |  7 +++++++
 live-build/auto/build | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a77630b4..c208a4f5 100644
--- a/debian/changelog
+++ b/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.
diff --git a/live-build/auto/build b/live-build/auto/build
index 391f616d..654c31dc 100755
--- a/live-build/auto/build
+++ b/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-4.4.0-1009-snapdragon dragon410c-firmware"
+                  linux_package="linux-image-snapdragon linux-firmware-snapdragon"
               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