Ubuntu
linux package

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

  1. Git
  2. lp:~ondrak/ubuntu/+source/linux/+git/xenial
  3. sauce-update
  4. Merge into snapdragon
Proposed by Ondrej Kubik
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 (community) Disapprove
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.
Revision history for this message
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
Reply

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.gitignore b/.gitignore
index efdd5ab..7d01974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,8 @@ all.config
117117
118# Kdevelop4118# Kdevelop4
119*.kdev4119*.kdev4
120parts
121stage
122prime
123snap/.snapcraft/
124*.snap
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e824727..f06c653 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -18,20 +18,25 @@ parts:
18 kconfigs:18 kconfigs:
19 - CONFIG_DEBUG_INFO=n19 - CONFIG_DEBUG_INFO=n
20 kernel-image-target: Image20 kernel-image-target: Image
21 install: |21 override-build: |
22 snapcraftctl build
22 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb23 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb
23 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/*.dtb $SNAPCRAFT_PART_INSTALL/dtbs/24 cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/*.dtb $SNAPCRAFT_PART_INSTALL/dtbs/
24 firmware:25 firmware:
25 plugin: nil26 plugin: nil
26 stage-packages:27 stage-packages:
27 - linux-firmware28 - on arm64:
28 - linux-firmware-snapdragon29 - linux-firmware
30 - linux-firmware-snapdragon
31 - else:
32 - linux-firmware
33 - linux-firmware-snapdragon:arm64
29 organize:34 organize:
30 lib/firmware: firmware35 lib/firmware: firmware
31 prime:36 prime:
32 - -usr37 - -usr
33 - -lib38 - -lib
34 install: |39 override-build: |
35 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan40 mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan
36 ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/41 ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/
37 build-packages:42 build-packages:

Subscribers

People subscribed via source and target branches