Merge ~sylvain-pineau/checkbox-core-snap:interim_release_support into checkbox-core-snap:master

[Sylvain Pineau]

Experimental support for interim release, requires a full run of edge/classic systems

Unmerged commits

c087cec... by Sylvain Pineau on 2021-04-23

Fix LD_LIBRARY_PATH additions

Add $RUNTIME/usr/lib/$ARCH
Remove $RUNTIME/lib/$ARCH

bbd0212... by Sylvain Pineau on 2021-04-23

Fix pulseaudio setup

See https://github.com/ubuntu/snapcraft-desktop-helpers/blob/master/common/desktop-exports

9368b2d... by Sylvain Pineau on 2021-04-23

Stage bash since recent version now have requirements on libc6 (>= 2.33)

6c595d0... by Sylvain Pineau on 2021-04-23

Add perl/perl-base packages to run the same version as the selected base

Required to run jobs using inxi (e.g: system_info_json)

diff --git a/config/wrapper_common_classic b/config/wrapper_common_classic
index a2f88bc..15d1c2b 100644
--- a/config/wrapper_common_classic
+++ b/config/wrapper_common_classic
@@ -23,10 +23,10 @@ else
   append_path PERL5LIB $RUNTIME/usr/lib/$ARCH/perl5/$PERL_VERSION
   append_path PERL5LIB $RUNTIME/usr/share/perl/$PERL_VERSION
   append_path PERL5LIB $RUNTIME/usr/share/perl5
-  append_path LD_LIBRARY_PATH $RUNTIME/lib
-  append_path LD_LIBRARY_PATH $RUNTIME/lib/$ARCH
-  append_path LD_LIBRARY_PATH $RUNTIME/usr/lib/$ARCH
-  append_path LD_LIBRARY_PATH $RUNTIME/lib/fwts
+  prepend_dir LD_LIBRARY_PATH $RUNTIME/lib
+  prepend_dir LD_LIBRARY_PATH $RUNTIME/usr/lib/
+  prepend_dir LD_LIBRARY_PATH $RUNTIME/usr/lib/$ARCH
+  prepend_dir LD_LIBRARY_PATH $RUNTIME/lib/fwts
   append_path GI_TYPELIB_PATH $RUNTIME/usr/lib/girepository-1.0
   append_path GI_TYPELIB_PATH $RUNTIME/usr/lib/$ARCH/girepository-1.0
   prepend_dir PATH $RUNTIME/bin
@@ -61,10 +61,16 @@ export GST_PLUGIN_SYSTEM_PATH=$RUNTIME/usr/lib/$ARCH/gstreamer-1.0
 # gst plugin scanner doesn't install in the correct path: https://github.com/ubuntu/snapcraft-desktop-helpers/issues/43
 export GST_PLUGIN_SCANNER=$RUNTIME/usr/lib/$ARCH/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner
 
+# Pulseaudio export
+append_path LD_LIBRARY_PATH $RUNTIME/usr/lib/$ARCH/pulseaudio
+
 # Make PulseAudio socket available inside the snap-specific $XDG_RUNTIME_DIR
 if [ -n "$XDG_RUNTIME_DIR" ]; then
-    export PULSE_RUNTIME_PATH="$XDG_RUNTIME_DIR/../pulse"
-    export PULSE_SYSTEM=1
+    pulsenative="pulse/native"
+    pulseaudio_sockpath="$XDG_RUNTIME_DIR/../$pulsenative"
+    if [ -S "$pulseaudio_sockpath" ]; then
+        export PULSE_SERVER="unix:${pulseaudio_sockpath}"
+    fi
 fi
 
 # Method for making providers available from the checkbox core snap without the
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index aa6c7b3..304d134 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -232,6 +232,7 @@ parts:
     plugin: checkbox-provider
     source: git://git.launchpad.net/plainbox-provider-checkbox
     stage-packages:
+      - bash
       - bc
       - bluez-tests
       - bonnie++
@@ -260,6 +261,7 @@ parts:
       - libasound2
       - libcap2-bin
       - libfdt1
+      - libffi7
       - lsb-release
       - lshw
       - mesa-utils
@@ -271,6 +273,8 @@ parts:
       - obexftp
       - parted
       - pciutils
+      - perl
+      - perl-base  # Both perl package are required to run inxi
       - pulseaudio-utils
       - pyotherside
       - python3-dbus