Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reset-tools: fixes and improvements in snapcraft.yaml #671

Merged
merged 2 commits into from Apr 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 10 additions & 12 deletions ci/snap/reset-tools/snapcraft.yaml
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -121,15 +119,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
Expand Down