[SRU] [Xenial] [snapdragon] [ PATCH 1/2 ] UBUNTU: SAUCE: snapcraft: Fixing cross build for firmware

[Ondrej Kubik]

BugLink: https://bugs.launchpad.net/bugs/1776723


With new stage package syntax in snapcraft.yaml cross build needs to be
handled

separatelly from native build.

Changing snapcraft.yaml to address broken build when cross building


Signed-off-by: Ondrej Kubik <ondrej.kubik at canonical.com>

---

 snapcraft.yaml | 8 ++++++--

 1 file changed, 6 insertions(+), 2 deletions(-)


diff --git a/snapcraft.yaml b/snapcraft.yaml

index e824727..ad929ea 100644

--- a/snapcraft.yaml

+++ b/snapcraft.yaml

@@ -24,8 +24,12 @@ parts:

   firmware:

     plugin: nil

     stage-packages:

-      - linux-firmware

-      - linux-firmware-snapdragon

+      - on arm64:

+        - linux-firmware

+        - linux-firmware-snapdragon

+      - else:

+        - linux-firmware

+        - linux-firmware-snapdragon:arm64

     organize:

       lib/firmware: firmware

     prime:

-- 

2.7.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20180626/7ad05ce9/attachment.html>