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
f87b93c... by Kleber Sacilotto de Souza on 2018-05-25

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

36128be... by Kleber Sacilotto de Souza on 2018-05-25

UBUNTU: [config] update config for master changes

BugLink: http://bugs.launchpad.net/bugs/1756866

CONFIG_DST_CACHE is a new config option which was added by stable
commit:
  911362c70d "net: add dst_cache support"

CONFIG_USB_NET_CDC_SUBSET_ENABLE is a new config option which was
added by stable commit:
  f3bb237: "USB: cdc_subset: only build when one driver is enabled"

Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

04fb71e... by Kleber Sacilotto de Souza on 2018-05-25

UBUNTU: Ubuntu-raspi2-4.4.0-1091.99

Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

118d99c... by Khaled El Mously on 2018-06-12

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Khalid Elmously <email address hidden>

a910892... by Khaled El Mously on 2018-06-12

UBUNTU: Ubuntu-raspi2-4.4.0-1092.100

Signed-off-by: Khalid Elmously <email address hidden>

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
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index ab6142a..5dbe309 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -18,36 +18,37 @@ parts:
6 kconfigs:
7 - CONFIG_DEBUG_INFO=n
8 kernel-image-target: zImage
9- install: |
10+ override-build: |
11+ snapcraftctl build
12 tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays
13 rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays
14+
15 firmware:
16 plugin: nil
17+ source: firmware
18+ after:
19+ - kernel
20 stage-packages:
21 - linux-firmware
22 organize:
23 lib/firmware: firmware
24- prime:
25+ stage:
26 - -usr
27 - -lib
28- install: |
29- rm $SNAPCRAFT_PART_INSTALL/lib/firmware/brcm/brcmfmac43430-sdio.bin
30- build-packages:
31- - cpio
32- - libssl-dev
33- - dpkg-dev
34+ - -firmware/brcm/brcmfmac43430-sdio.bin
35+
36 raspiwififw:
37 plugin: nil
38- source: .
39+ source: firmware
40 after:
41 - firmware
42- prepare: |
43+ override-pull: |
44 PKGS="http://ppa.launchpad.net/snappy-dev/image/ubuntu/dists/xenial/main/binary-armhf/Packages.gz"
45 PKGPATH="$(wget -q -O- $PKGS|zcat|grep-dctrl raspberrypi-wireless-firmware |\
46 grep Filename|tail -1| sed 's/^Filename: //')"
47 wget http://ppa.launchpad.net/snappy-dev/image/ubuntu/$PKGPATH
48 dpkg -x $(basename $PKGPATH) unpack/
49- install: |
50+ override-build: |
51 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/brcm
52 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/brcm
54@@ -56,3 +57,5 @@ parts:
55 - dctrl-tools
56 - sed
57 - wget
58+ - libssl-dev
59+ - dpkg-dev

Subscribers

People subscribed via source and target branches