From 2fee3d52d9e358703cb99baed9a9e13b446b5590 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 15 Mar 2016 13:21:25 +0100
Subject: [PATCH] Import patches-unapplied version 2.388 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 307bc170c2cad01c25e017337a6eac01fdd0521c

New changelog entries:
  * add support for dragonboard kernel snap
  * remove  grub-efi-arm64 to the arm64 OS snap as it breaks uboot
---
 debian/changelog       |  7 +++++++
 live-build/auto/build  | 23 ++++++++++++++++++++++-
 live-build/auto/config |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 496b4430..25548284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.388) xenial; urgency=medium
+
+  * add support for dragonboard kernel snap
+  * remove  grub-efi-arm64 to the arm64 OS snap as it breaks uboot
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 15 Mar 2016 13:21:25 +0100
+
 livecd-rootfs (2.387) xenial; urgency=medium
 
   * Move the new touch click apps (unav, dekko, calendar) to the custom
diff --git a/live-build/auto/build b/live-build/auto/build
index 946fa731..c8b6fcb7 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -376,7 +376,10 @@ case $PROJECT:$SUBPROJECT in
           armhf)
             subarches="generic raspi2"
             ;;
-          i386|amd64|arm64|powerpc|ppc64el)
+          arm64)
+            subarches="generic dragonboard"
+            ;;
+          i386|amd64|powerpc|ppc64el)
             subarches="generic"
             ;;
       esac
@@ -401,6 +404,12 @@ case $PROJECT:$SUBPROJECT in
             amd64)
               linux_package="linux-signed-generic"
               ;;
+            arm64)
+              if [ "$devarch" = "dragonboard" ]; then
+                  # ugly hack til we have a metapackage
+                  linux_package="$(apt-cache search generic-dragon410c|grep linux-image|tail -1|sed 's/ .*$//g') dragon410c-firmware"
+              fi
+              ;;
         esac
 
         # make sure all virtual filesystems are available
@@ -461,6 +470,9 @@ case $PROJECT:$SUBPROJECT in
                        rm -rf $TMPDIR/assets/dtbs/overlays
                    fi
                    ;;
+               dragonboard)
+                   cp $TMPDIR/assets/dtbs/qcom/apq8016-sbc-snappy.dtb $TMPDIR/assets/dtbs/apq8016-sbc.dtb
+                   ;;
            esac
         fi
 
@@ -495,6 +507,9 @@ EOF
         if [ "$devarch" = "raspi2" ];then
             tarname="raspi2.$tarname"
             manifestname="$devarch.$manifestname"
+        elif [ "$devarch" = "dragonboard" ];then
+            tarname="$devarch.$tarname"
+            manifestname="$devarch.$manifestname"
         fi
         # create tarfile
         tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml
@@ -523,6 +538,9 @@ EOF
             snapname="$devarch.kernel.snap"
         elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then
             metaname=canonical-bbb-linux
+        elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then
+            metaname=canonical-dragon-linux
+            snapname="$devarch.kernel.snap"
         fi
 
         rm -rf $HERE/snap || true
@@ -551,6 +569,9 @@ initrd: $(ls initrd.img-*)
 modules: $(ls -d lib/modules/*)
 firmware: lib/firmware
 EOF
+        if [ -d dtbs ]; then
+            printf "dtbs: dtbs/ \n" >> meta/snap.yaml
+        fi
         cd $HERE
 
         apt-get -y install ubuntu-snappy-cli
diff --git a/live-build/auto/config b/live-build/auto/config
index a42ad635..6b0e132d 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 grub-efi-arm64
+					add_package install u-boot-tools
                                         ;;
 			esac
 			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"