Merge ~robertliu/+git/sa8155p-gadget:update-post-boot-init-entries-for-uc22 into ~ubuntu-cervinia/+git/sa8155p-gadget:uc20

Proposed by Robert Liu
Status: Merged
Approved by: Robert Liu
Approved revision: 56df7e5abb7ea2129ff284f864401248bbab7699
Merged at revision: a8c20315f9468f0a01316477611571e13a9f61c1
Proposed branch: ~robertliu/+git/sa8155p-gadget:update-post-boot-init-entries-for-uc22
Merge into: ~ubuntu-cervinia/+git/sa8155p-gadget:uc20
Diff against target: 22 lines (+11/-0)
1 file modified
snap/snapcraft.yaml (+11/-0)
Reviewer Review Type Date Requested Status
Aristo Chen Approve
Ondrej Kubik Pending
ubuntu-cervinia Pending
Review via email: mp+443459@code.launchpad.net

Description of the change

This patch is from this MP: https://code.launchpad.net/~robertliu/+git/sa8155p-gadget/+merge/443392

Since we are using the same gadget snap name for both UC20 and UC22, we have to use the same definitions of the system-files plug for post-boot-init script.

To post a comment you must log in.
Revision history for this message
Aristo Chen (aristochen) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f71ff1f..9c89e2a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -276,6 +276,17 @@ plugs:
276 - /sys/module/lowmemorykiller/parameters/oom_reaper276 - /sys/module/lowmemorykiller/parameters/oom_reaper
277 - /proc/sys/vm/watermark_scale_factor277 - /proc/sys/vm/watermark_scale_factor
278 - /proc/sys/vm/reap_mem_on_sigkill278 - /proc/sys/vm/reap_mem_on_sigkill
279 # more paths for uc22
280 - /sys/bus/platform/devices/soc:mem_dump
281 - /sys/devices/platform/soc@0/10a2000.dcc_v2
282 - /sys/devices/platform/soc@0/2c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0
283 - /sys/devices/platform/soc@0/6002000.stm/coresight-stm/traceid
284 - /sys/devices/platform/soc@0/6b02000.tpdm/coresight-tpdm-swao-0
285 - /sys/devices/platform/soc@0/6048000.tmc/coresight-tmc-etr
286 - /sys/devices/platform/soc@0/6b04000.cti/coresight-cti-swao_cti0
287 - /sys/devices/platform/soc@0/7860000.tpdm/coresight-tpdm-apss
288 - /sys/devices/virtual/stm_source/ftrace/stm_source_link
289 - /sys/kernel/config/stp-policy/coresight-stm:p_ost.policy
279290
280slots:291slots:
281 volume-ssd:292 volume-ssd:

Subscribers

People subscribed via source and target branches

to all changes: