[PATCH] [SRU][X/raspi2] Fix kernel snap creation

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] [SRU][X/raspi2] Fix kernel snap creation

Paolo Pisati-5
BugLink: http://bugs.launchpad.net/bugs/1785075

Impact:

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

How test it:

git clone the Xenial tree[1], checkout the raspi2 branch and try to snap it:

$ git clone git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial
$ cd linux
$ git checkout raspi2
linux$ snapcraft --target-arch=arm
...
Preparing to build raspiwififw
Building raspiwififw
--2018-08-02 15:04:14--
http://ppa.launchpad.net/snappy-dev/image/ubuntu/pool/main/r/raspberrypi-wireless-firmware/raspberrypi-wireless-firmware_2.0.1_armhf.deb
Resolving ppa.launchpad.net (ppa.launchpad.net)... 91.189.95.83
Connecting to ppa.launchpad.net (ppa.launchpad.net)|91.189.95.83|:80...
connected.
HTTP request sent, awaiting response... 200 OK
Length: 8568 (8.4K) [application/x-debian-package]
Saving to: ‘raspberrypi-wireless-firmware_2.0.1_armhf.deb’

raspberrypi-wireless-firmware_2.0.1_a
100%[=========================================================================>]
8.37K --.-KB/s in 0s

2018-08-02 15:04:14 (114 MB/s) - ‘raspberrypi-wireless-firmware_2.0.1_armhf.deb’
saved [8568/8568]

mv: cannot stat 'unpack/lib/firmware/brcm80211/brcm/*': No such file or directory
Failed to run 'install': Exit code was 1.

Apply the attached patch and redo the above steps: you will get a kernel snap
now.

Regression:

None, it actually fixes the kernel snap creation

Paolo Pisati (1):
  UBUNTU: snapcraft.yaml: wifi fw files are now part of linux-firmware

 snapcraft.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Paolo Pisati-5
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 <[hidden email]>
---
 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
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH] [SRU][X/raspi2] Fix kernel snap creation

Kleber Souza
In reply to this post by Paolo Pisati-5
On 08/02/18 17:23, Paolo Pisati wrote:

> BugLink: http://bugs.launchpad.net/bugs/1785075
>
> Impact:
>
> 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
>
> How test it:
>
> git clone the Xenial tree[1], checkout the raspi2 branch and try to snap it:
>
> $ git clone git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/xenial
> $ cd linux
> $ git checkout raspi2
> linux$ snapcraft --target-arch=arm
> ...
> Preparing to build raspiwififw
> Building raspiwififw
> --2018-08-02 15:04:14--
> http://ppa.launchpad.net/snappy-dev/image/ubuntu/pool/main/r/raspberrypi-wireless-firmware/raspberrypi-wireless-firmware_2.0.1_armhf.deb
> Resolving ppa.launchpad.net (ppa.launchpad.net)... 91.189.95.83
> Connecting to ppa.launchpad.net (ppa.launchpad.net)|91.189.95.83|:80...
> connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 8568 (8.4K) [application/x-debian-package]
> Saving to: ‘raspberrypi-wireless-firmware_2.0.1_armhf.deb’
>
> raspberrypi-wireless-firmware_2.0.1_a
> 100%[=========================================================================>]
> 8.37K --.-KB/s in 0s
>
> 2018-08-02 15:04:14 (114 MB/s) - ‘raspberrypi-wireless-firmware_2.0.1_armhf.deb’
> saved [8568/8568]
>
> mv: cannot stat 'unpack/lib/firmware/brcm80211/brcm/*': No such file or directory
> Failed to run 'install': Exit code was 1.
>
> Apply the attached patch and redo the above steps: you will get a kernel snap
> now.
>
> Regression:
>
> None, it actually fixes the kernel snap creation
>
> Paolo Pisati (1):
>   UBUNTU: snapcraft.yaml: wifi fw files are now part of linux-firmware
>
>  snapcraft.yaml | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team