Merge ~ondrak/ubuntu/+source/linux/+git/xenial:raspi2-sauce-update into ~ubuntu-kernel/ubuntu/+source/linux/+git/xenial:raspi2

Proposed by Ondrej Kubik on 2018-05-23
Status: Needs review
Proposed branch: ~ondrak/ubuntu/+source/linux/+git/xenial:raspi2-sauce-update
Merge into: ~ubuntu-kernel/ubuntu/+source/linux/+git/xenial:raspi2
Diff against target: 59 lines (+14/-11)
1 file modified
snapcraft.yaml (+14/-11)
Reviewer Review Type Date Requested Status
Paolo Pisati 2018-05-23 Disapprove on 2018-05-24
Review via email: mp+346763@code.launchpad.net

Commit message

Updating snapcraft.yaml to use new scriptlet syntax

To post a comment you must log in.
Paolo Pisati (p-pisati) wrote :

I don't have write access to the kernel repository, only the stable team has it: resend it to the ubuntu kernel ml for review.

Plus, it's missing an LP bug and the buglink.

review: Disapprove

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snapcraft.yaml b/snapcraft.yaml
index ab6142a..5dbe309 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -18,36 +18,37 @@ parts:
18 kconfigs:18 kconfigs:
19 - CONFIG_DEBUG_INFO=n19 - CONFIG_DEBUG_INFO=n
20 kernel-image-target: zImage20 kernel-image-target: zImage
21 install: |21 override-build: |
22 snapcraftctl build
22 tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays23 tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
23 rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays24 rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
25
24 firmware:26 firmware:
25 plugin: nil27 plugin: nil
28 source: firmware
29 after:
30 - kernel
26 stage-packages:31 stage-packages:
27 - linux-firmware32 - linux-firmware
28 organize:33 organize:
29 lib/firmware: firmware34 lib/firmware: firmware
30 prime:35 stage:
31 - -usr36 - -usr
32 - -lib37 - -lib
33 install: |38 - -firmware/brcm/brcmfmac43430-sdio.bin
34 rm $SNAPCRAFT_PART_INSTALL/lib/firmware/brcm/brcmfmac43430-sdio.bin39
35 build-packages:
36 - cpio
37 - libssl-dev
38 - dpkg-dev
39 raspiwififw:40 raspiwififw:
40 plugin: nil41 plugin: nil
41 source: .42 source: firmware
42 after:43 after:
43 - firmware44 - firmware
44 prepare: |45 override-pull: |
45 PKGS="http://ppa.launchpad.net/snappy-dev/image/ubuntu/dists/xenial/main/binary-armhf/Packages.gz"46 PKGS="http://ppa.launchpad.net/snappy-dev/image/ubuntu/dists/xenial/main/binary-armhf/Packages.gz"
46 PKGPATH="$(wget -q -O- $PKGS|zcat|grep-dctrl raspberrypi-wireless-firmware |\47 PKGPATH="$(wget -q -O- $PKGS|zcat|grep-dctrl raspberrypi-wireless-firmware |\
47 grep Filename|tail -1| sed 's/^Filename: //')"48 grep Filename|tail -1| sed 's/^Filename: //')"
48 wget http://ppa.launchpad.net/snappy-dev/image/ubuntu/$PKGPATH49 wget http://ppa.launchpad.net/snappy-dev/image/ubuntu/$PKGPATH
49 dpkg -x $(basename $PKGPATH) unpack/50 dpkg -x $(basename $PKGPATH) unpack/
50 install: |51 override-build: |
51 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm52 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm
52 mv unpack/usr/share/doc/raspberrypi-wireless-firmware $SNAPCRAFT_PART_INSTALL/firmware/rpi-wlanfw-licenses53 mv unpack/usr/share/doc/raspberrypi-wireless-firmware $SNAPCRAFT_PART_INSTALL/firmware/rpi-wlanfw-licenses
53 mv unpack/lib/firmware/brcm80211/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm54 mv unpack/lib/firmware/brcm80211/brcm/* $SNAPCRAFT_PART_INSTALL/firmware/brcm
@@ -56,3 +57,5 @@ parts:
56 - dctrl-tools57 - dctrl-tools
57 - sed58 - sed
58 - wget59 - wget
60 - libssl-dev
61 - dpkg-dev

Subscribers

People subscribed via source and target branches