From 740a44e95772f65d6ec1f3e439829f6d307ec9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yao=20Wei=20=28=E9=AD=8F=E9=8A=98=E5=BB=B7=29?= Date: Thu, 18 Apr 2024 13:25:46 +0800 Subject: [PATCH 1/2] reset-tools: rename interfaces for reset.yaml --- ci/snap/reset-tools/snapcraft.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/snap/reset-tools/snapcraft.yaml b/ci/snap/reset-tools/snapcraft.yaml index c644033ac..0da32baa4 100644 --- a/ci/snap/reset-tools/snapcraft.yaml +++ b/ci/snap/reset-tools/snapcraft.yaml @@ -20,8 +20,8 @@ apps: - shutdown - removable-media - block-devices - - reset-partition-fsuuid - - reset-yaml + - etc-reset-partition-fsuuid + - usr-share-desktop-provision-reset-yaml - udisks2 - hardware-observe - mount-observe @@ -32,8 +32,8 @@ apps: - shutdown - removable-media - block-devices - - reset-partition-fsuuid - - reset-yaml + - etc-reset-partition-fsuuid + - usr-share-desktop-provision-reset-yaml - udisks2 - hardware-observe - mount-observe @@ -44,8 +44,8 @@ apps: activates-on: [dbus-service] plugs: - shutdown - - boot-grub - - reset-yaml + - hostfs-boot-grub + - usr-share-desktop-provision-reset-yaml parts: flutter-git: @@ -121,15 +121,15 @@ slots: name: com.canonical.oem.FactoryResetTools plugs: - boot-grub: + hostfs-boot-grub: interface: system-files write: - /var/lib/snapd/hostfs/boot/grub - reset-partition-fsuuid: + etc-reset-partition-fsuuid: interface: system-files read: - /etc/reset_partition_fsuuid - reset-yaml: + usr-share-desktop-provision-reset-yaml: interface: system-files read: - /usr/share/desktop-provision/reset.yaml From 46a384aa76a60c58fef9b3b10911c4c8178f4bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yao=20Wei=20=28=E9=AD=8F=E9=8A=98=E5=BB=B7=29?= Date: Thu, 18 Apr 2024 13:26:51 +0800 Subject: [PATCH 2/2] reset-tools: remove icon/desktop copying in snapcraft.yaml --- ci/snap/reset-tools/snapcraft.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/snap/reset-tools/snapcraft.yaml b/ci/snap/reset-tools/snapcraft.yaml index 0da32baa4..391808c42 100644 --- a/ci/snap/reset-tools/snapcraft.yaml +++ b/ci/snap/reset-tools/snapcraft.yaml @@ -86,9 +86,7 @@ parts: build-attributes: [enable-patchelf] override-build: | set -eux - mkdir -p $CRAFT_PART_INSTALL/bin/lib -p $CRAFT_PART_INSTALL/usr/share/applications $CRAFT_PART_INSTALL/usr/share/icons/hicolor/256x256 - cp ci/snap/reset-tools/local/factory-reset-tools.desktop $CRAFT_PART_INSTALL/usr/share/applications/ - cp ci/snap/reset-tools/local/factory-reset-tools.png $CRAFT_PART_INSTALL/usr/share/icons/hicolor/256x256/ + mkdir -p $CRAFT_PART_INSTALL/bin dart pub global activate melos dart pub global run melos bootstrap