From f51f8e92a544d1d9089e0d146382b56b5b58820c Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 16 Mar 2016 14:28:22 +0100
Subject: [PATCH] Import patches-unapplied version 2.390 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: ce1a28e5422d5cc751b845a0e86fcd61fb48d7c2

New changelog entries:
  * add link for wlan mac address in dragonboard kernel snaps
  * move dragonboard kernel snap to linux-snapdragon (with a currently hardcoded
    version due to missing -meta package for this kernel, don't do that at
    home !)
---
 debian/changelog      | 9 +++++++++
 live-build/auto/build | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e4f0339..c7623e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.390) xenial; urgency=medium
+
+  * add link for wlan mac address in dragonboard kernel snaps
+  * move dragonboard kernel snap to linux-snapdragon (with a currently hardcoded
+    version due to missing -meta package for this kernel, don't do that at
+    home !)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 16 Mar 2016 14:28:22 +0100
+
 livecd-rootfs (2.389) xenial; urgency=medium
 
   * Follow rename of ubuntustudio-font-meta to ubuntustudio-fonts.
diff --git a/live-build/auto/build b/live-build/auto/build
index c8b6fcb7..383e110c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -407,7 +407,7 @@ case $PROJECT:$SUBPROJECT in
             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"
+                  linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware"
               fi
               ;;
         esac
@@ -472,6 +472,9 @@ case $PROJECT:$SUBPROJECT in
                    ;;
                dragonboard)
                    cp $TMPDIR/assets/dtbs/qcom/apq8016-sbc-snappy.dtb $TMPDIR/assets/dtbs/apq8016-sbc.dtb
+                   # add special link needed by the dragonboard wifi driver
+                   mkdir -p $TMPDIR/system/lib/firmware/wlan/
+                   ln -s /run/macaddr0 $TMPDIR/system/lib/firmware/wlan/
                    ;;
            esac
         fi
@@ -539,7 +542,7 @@ EOF
         elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then
             metaname=canonical-bbb-linux
         elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then
-            metaname=canonical-dragon-linux
+            metaname=canonical-snapdragon-linux
             snapname="$devarch.kernel.snap"
         fi