UBUNTU: snapcraft.yaml: wifi fw files are now part of linux-firmware

Message ID 1533223425-23129-2-git-send-email-paolo.pisati@canonical.com
State New
Headers show
Series
  • UBUNTU: snapcraft.yaml: wifi fw files are now part of linux-firmware
Related show

Commit Message

Paolo Pisati Aug. 2, 2018, 3:23 p.m.
BugLink: http://bugs.launchpad.net/bugs/1785075

The Xenial/raspi2 kernel fails to generate a kernel snap since the wifi fw files
are now part of linux-firmware, and were removed from
raspberrypi-wireless-firmware: update snapcraft.yaml accordingly.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 snapcraft.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ab6142a..82b4fb0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -30,8 +30,6 @@  parts:
     prime:
       - -usr
       - -lib
-    install: |
-      rm $SNAPCRAFT_PART_INSTALL/lib/firmware/brcm/brcmfmac43430-sdio.bin
     build-packages:
       - cpio
       - libssl-dev
@@ -50,7 +48,7 @@  parts:
     install: |
       mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm
       mv unpack/usr/share/doc/raspberrypi-wireless-firmware $SNAPCRAFT_PART_INSTALL/firmware/rpi-wlanfw-licenses
-      mv unpack/lib/firmware/brcm80211/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm
+      mv unpack/lib/firmware/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm
     build-packages:
       - coreutils
       - dctrl-tools