From 07c29cb4f26778cf7b919849bdd6f163f7c7c957 Mon Sep 17 00:00:00 2001
From: Hook25 <massimiliano.girardi@canonical.com>
Date: Tue, 16 Apr 2024 10:13:27 +0200
Subject: [PATCH] Remove default provider and add perl everywhere

---
 checkbox-core-snap/series24/snap/snapcraft.yaml |  1 +
 checkbox-snap/series_uc24/snap/snapcraft.yaml   | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml
index da1c979da2..41d3b6ee6c 100644
--- a/checkbox-core-snap/series24/snap/snapcraft.yaml
+++ b/checkbox-core-snap/series24/snap/snapcraft.yaml
@@ -144,6 +144,7 @@ parts:
       - zlib1g-dev
       - build-essential
     stage-packages:
+      - perl
       - python3-markupsafe
       - python3-jinja2
       - python3-packaging
diff --git a/checkbox-snap/series_uc24/snap/snapcraft.yaml b/checkbox-snap/series_uc24/snap/snapcraft.yaml
index 2a51c05735..a12529543f 100644
--- a/checkbox-snap/series_uc24/snap/snapcraft.yaml
+++ b/checkbox-snap/series_uc24/snap/snapcraft.yaml
@@ -14,39 +14,30 @@ plugs:
   checkbox-runtime:
     interface: content
     target: $SNAP/checkbox-runtime
-    default-provider: checkbox24
   provider-resource:
     interface: content
     target: $SNAP/providers/checkbox-provider-resource
-    default-provider: checkbox24
   provider-checkbox:
     interface: content
     target: $SNAP/providers/checkbox-provider-checkbox
-    default-provider: checkbox24
   provider-docker:
     interface: content
     target: $SNAP/providers/checkbox-provider-docker
-    default-provider: checkbox24
   provider-tpm2:
     interface: content
     target: $SNAP/providers/checkbox-provider-tpm2
-    default-provider: checkbox24
   provider-sru:
     interface: content
     target: $SNAP/providers/checkbox-provider-sru
-    default-provider: checkbox24
   provider-gpgpu:
     interface: content
     target: $SNAP/providers/checkbox-provider-gpgpu
-    default-provider: checkbox24
   provider-certification-client:
     interface: content
     target: $SNAP/providers/checkbox-provider-certification-client
-    default-provider: checkbox24
   provider-certification-server:
     interface: content
     target: $SNAP/providers/checkbox-provider-certification-server
-    default-provider: checkbox24
 
 apps:
   checkbox-cli:
@@ -126,3 +117,7 @@ parts:
       echo "this only contains random bytes to pad the snap to 16kb" >> $SNAPCRAFT_PART_INSTALL/size_workaround
       echo "see: https://bugs.launchpad.net/review-tools/+bug/2049093" >>  $SNAPCRAFT_PART_INSTALL/size_workaround
       head -c 16384 /dev/urandom >> $SNAPCRAFT_PART_INSTALL/size_workaround
+  install_perl:
+    plugin: nil
+    stage-packages:
+      - perl