[snap] switch to core18 base (Fixes #598)

snap/snapcraft.yaml

@@ -11,7 +11,7 @@ license: GPL-3.0
 
 adopt-info: multipass
 confinement: classic
-base: core
+base: core18
 
 architectures:
 - build-on: amd64
@@ -52,144 +52,7 @@ apps:
     command: bin/multipass-gui
 
 parts:
-  qtbase5-dev:
-    after: [qt5-qmake-bin]
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/qtbase5-dev_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qtbase5-dev_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qtbase5-dev_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    prime: [-*]
-
-  qtbase5-dev-tools:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/qtbase5-dev-tools_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qtbase5-dev-tools_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qtbase5-dev-tools_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    prime: [-*]
-
-  qt5-qmake:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/qt5-qmake_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qt5-qmake_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qt5-qmake_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    prime: [-*]
-
-  qt5-qmake-bin:
-    after: [qt5-qmake]
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/qt5-qmake-bin_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qt5-qmake-bin_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/qt5-qmake-bin_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    prime: [-*]
-
-  libqt5core5a:
-    after: [libicu]
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5core5a_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5core5a_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5core5a_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    stage-packages:
-    - libdouble-conversion1v5
-    - libpcre16-3
-
-  libqt5dbus5:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5dbus5_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5dbus5_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5dbus5_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-
-  libqt5network5:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5network5_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5network5_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5network5_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    stage-packages:
-    - libproxy1v5
-
-  libqt5gui5:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-    stage-packages:
-    - mesa-common-dev
-
-  libqt5widgets5:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_arm64.deb
-    source-type: deb
-
-  libicu:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu60_60.2-3ubuntu3_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/i/icu/libicu60_60.2-3ubuntu3_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/i/icu/libicu60_60.2-3ubuntu3_arm64.deb
-    source-type: deb
-
-  libssl11:
-    plugin: dump
-    source:
-    - on amd64: http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_arm64.deb
-
-  libharfbuzz0b:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_arm64.deb
-    source-type: deb
-    stage-packages:
-    - libgraphite2-3
-
-  libfreetype6:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_arm64.deb
-    source-type: deb
-
-  libxcb-xinerama0:
-    plugin: dump
-    source:
-    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_amd64.deb
-    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_armhf.deb
-    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_arm64.deb
-    source-type: deb
-
   multipass:
-    after:
-    - qtbase5-dev
-    - qtbase5-dev-tools
-    - libqt5core5a
-    - libqt5network5
-    - libqt5gui5
-    - libqt5widgets5
-    - libharfbuzz0b
-    - libfreetype6
-    - libxcb-xinerama0
     plugin: cmake
     build-packages:
     - on arm64: [libgles2-mesa-dev]
@@ -201,11 +64,17 @@ parts:
     - libsystemd-dev
     - libvirt-dev
     - pkg-config
+    - qtbase5-dev
+    - qtbase5-dev-tools
     stage-packages:
     - on amd64: [libgl1]
     - on armhf: [libgles2-mesa]
     - on arm64: [libgles2-mesa]
     - libpng16-16
+    - libqt5core5a
+    - libqt5gui5
+    - libqt5network5
+    - libqt5widgets5
     - libxml2
     - libvirt0
     - dnsmasq
@@ -234,11 +103,11 @@ parts:
     - qemu-utils
     - libslang2
     organize:
-      usr/lib/*/pulseaudio/libpulsecommon-8.0.so: usr/lib/libpulsecommon-8.0.so
-      usr/share/seabios/bios-256k.bin: qemu/bios-256k.bin
-      usr/share/seabios/vgabios-stdvga.bin: qemu/vgabios-stdvga.bin
-      usr/share/seabios/kvmvapic.bin: qemu/kvmvapic.bin
-      usr/lib/ipxe/qemu/efi-virtio.rom: qemu/efi-virtio.rom
+      usr/lib/*/pulseaudio/libpulsecommon-*.so: usr/lib/
+      usr/share/seabios/bios-256k.bin: qemu/
+      usr/share/seabios/vgabios-stdvga.bin: qemu/
+      usr/share/seabios/kvmvapic.bin: qemu/
+      usr/lib/ipxe/qemu/efi-virtio.rom: qemu/
 
   kvm-support:
     plugin: nil
@@ -253,6 +122,7 @@ parts:
     - iproute2
     - iputils-ping
     - libatm1
+    - libxtables12
 
   xterm:
     plugin: nil

tests/travis-Coverage.patch

@@ -1,14 +1,16 @@
+diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
+index 74ae0d0b..66ba161c 100644
 --- a/snap/snapcraft.yaml
 +++ b/snap/snapcraft.yaml
-@@ -209,6 +209,7 @@ parts:
-     - libsystemd-dev
-     - libvirt-dev
+@@ -66,6 +66,7 @@ parts:
      - pkg-config
+     - qtbase5-dev
+     - qtbase5-dev-tools
 +    - lcov
      stage-packages:
      - on amd64: [libgl1]
-     - on i386: [libgl1]
-@@ -220,9 +221,8 @@ parts:
+     - on armhf: [libgles2-mesa]
+@@ -79,9 +80,8 @@ parts:
      - dnsmasq
      source: .
      configflags: