From a668d140ccddae197537d7a6522b3f85b8464ecc Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@ubuntu.com>
Date: Mon, 14 Mar 2016 10:31:55 -0600
Subject: [PATCH] Import patches-unapplied version 2.386 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 6052273963885922b338a4ceafc2c68f6c7457be

New changelog entries:
  [ Michael Vogt ]
  * add dpkg.list to assets of the kernel snap
  * add grub-efi-arm64 to the arm64 OS snap
  [ Adam Conrad ]
  * Build raspi2 images with multiverse for firmware.
---
 debian/changelog       | 11 +++++++++++
 live-build/auto/build  |  6 ++++++
 live-build/auto/config |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7714ac30..0accd14c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.386) xenial; urgency=medium
+
+  [ Michael Vogt ]
+  * add dpkg.list to assets of the kernel snap
+  * add grub-efi-arm64 to the arm64 OS snap
+
+  [ Adam Conrad ]
+  * Build raspi2 images with multiverse for firmware.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 14 Mar 2016 10:31:55 -0600
+
 livecd-rootfs (2.385) xenial; urgency=medium
 
   * add snap building for kernel snaps
diff --git a/live-build/auto/build b/live-build/auto/build
index e4a3d9de..946fa731 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -491,11 +491,17 @@ EOF
         # compress everything
         cd $TMPDIR
         tarname="device.tar.gz"
+        manifestname="device.manifest"
         if [ "$devarch" = "raspi2" ];then
             tarname="raspi2.$tarname"
+            manifestname="$devarch.$manifestname"
         fi
+        # create tarfile
         tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml
 
+        # create device specific manifest to track kernel dpkg version
+        cp assets/dpkg.list $HERE/$PREFIX.$manifestname
+
         # show size of initrd and kernel in the log
         ls -lh assets/
 
diff --git a/live-build/auto/config b/live-build/auto/config
index a471a680..a42ad635 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -424,7 +424,7 @@ case $PROJECT in
 					add_package install flash-kernel u-boot-tools
 					;;
 				arm64)
-					add_package install u-boot-tools
+					add_package install u-boot-tools grub-efi-arm64
                                         ;;
 			esac
 			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
@@ -569,7 +569,7 @@ case $ARCH in
 				echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot
 				;;
 			raspi2)
-				COMPONENTS='main restricted universe'
+				COMPONENTS='main restricted universe multiverse'
 				add_package install raspberrypi2-firmware u-boot-rpi flash-kernel u-boot-tools
 				BINARY_REMOVE_LINUX=false
 				;;