From patchwork Thu Aug 2 15:23:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 952871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41hDV52lDtz9s2g; Fri, 3 Aug 2018 01:23:56 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1flFS8-0006Iz-69; Thu, 02 Aug 2018 15:23:48 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1flFS6-0006Ib-Dl for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:23:46 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1flFS6-0006ZJ-58 for kernel-team@lists.ubuntu.com; Thu, 02 Aug 2018 15:23:46 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: snapcraft.yaml: wifi fw files are now part of linux-firmware Date: Thu, 2 Aug 2018 17:23:45 +0200 Message-Id: <1533223425-23129-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533223425-23129-1-git-send-email-paolo.pisati@canonical.com> References: <1533223425-23129-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- snapcraft.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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