Move back to libvirt from deb

snapcraft.yaml

@@ -520,12 +520,12 @@ parts:
     - on arm64: [qemu-system-arm]
     - 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
+#    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
 
   kvm-support:
     plugin: nil
@@ -533,7 +533,8 @@ parts:
     - try: [msr-tools]
 
   libvirt:
-    source: https://libvirt.org/sources/libvirt-4.6.0.tar.xz
+    source: .
+    source-subdir: libvirt-1.3.1
     plugin: autotools
     build-packages:
     - libxml2-dev
@@ -553,8 +554,8 @@ parts:
     - libnl-route-3-dev
     - uuid-dev
     - try: [libnuma-dev]
-    - xsltproc
-    - libjansson-dev
+    - wget
+    - dpkg-dev
     stage-packages:
     - dmidecode
     - dnsmasq
@@ -565,7 +566,6 @@ parts:
     - try: [libnuma1]
     - libcurl3-gnutls
     - libpciaccess0
-    - libxml2-utils
     configflags:
     - --with-qemu
     - --without-bhyve
@@ -592,6 +592,12 @@ parts:
     - DMIDECODE=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/sbin/dmidecode
     - OVSVSCTL=/snap/$SNAPCRAFT_PROJECT_NAME/current/bin/ovs-vsctl
     - EBTABLES_PATH=/snap/$SNAPCRAFT_PROJECT_NAME/current/sbin/ebtables
+    override-build: |
+      wget http://archive.ubuntu.com/ubuntu/pool/main/libv/libvirt/libvirt_1.3.1.orig.tar.gz
+      wget http://archive.ubuntu.com/ubuntu/pool/main/libv/libvirt/libvirt_1.3.1-1ubuntu10.24.debian.tar.xz
+      wget http://archive.ubuntu.com/ubuntu/pool/main/libv/libvirt/libvirt_1.3.1-1ubuntu10.24.dsc
+      dpkg-source -x libvirt*.dsc
+      snapcraftctl build
     organize:
       # Hack to shift installed libvirt back to root of snap
       # required to ensure that pathing to files etc works at