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

Proposed by Ondrej Kubik on 2018-05-23
Status: Needs review
Proposed branch: ~ondrak/ubuntu/+source/linux/+git/xenial:sauce-update
Merge into: ~ubuntu-kernel/ubuntu/+source/linux/+git/xenial:snapdragon
Diff against target: 47 lines (+14/-4)
2 files modified
.gitignore (+5/-0)
snapcraft.yaml (+9/-4)
Reviewer Review Type Date Requested Status
Paolo Pisati 2018-05-23 Disapprove on 2018-05-24
Review via email: mp+346756@code.launchpad.net

Commit message

- loosening gitignore filtering to enable different snap name builds
- fixing cross build for firmware part in snapcraft.yaml
- updating snapcraft.yaml to follow 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
1diff --git a/.gitignore b/.gitignore
2index efdd5ab..7d01974 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -117,3 +117,8 @@ all.config
6
7 # Kdevelop4
8 *.kdev4
9+parts
10+stage
11+prime
12+snap/.snapcraft/
13+*.snap
14diff --git a/snapcraft.yaml b/snapcraft.yaml
15index e824727..f06c653 100644
16--- a/snapcraft.yaml
17+++ b/snapcraft.yaml
18@@ -18,20 +18,25 @@ parts:
19 kconfigs:
20 - CONFIG_DEBUG_INFO=n
21 kernel-image-target: Image
22- install: |
23+ override-build: |
24+ snapcraftctl build
25 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb
26 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/*.dtb $SNAPCRAFT_PART_INSTALL/dtbs/
27 firmware:
28 plugin: nil
29 stage-packages:
30- - linux-firmware
31- - linux-firmware-snapdragon
32+ - on arm64:
33+ - linux-firmware
34+ - linux-firmware-snapdragon
35+ - else:
36+ - linux-firmware
37+ - linux-firmware-snapdragon:arm64
38 organize:
39 lib/firmware: firmware
40 prime:
41 - -usr
42 - -lib
43- install: |
44+ override-build: |
45 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan
46 ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/
47 build-packages:

Subscribers

People subscribed via source and target branches