Move back to libvirt from deb

This commit is contained in:
James Page 2018-11-02 13:23:46 +00:00
parent 6cf0f71b46
commit ded8db88e5
1 changed files with 16 additions and 10 deletions

View File

@ -520,12 +520,12 @@ parts:
- on arm64: [qemu-system-arm] - on arm64: [qemu-system-arm]
- qemu-utils - qemu-utils
- libslang2 - libslang2
organize: # organize:
usr/lib/*/pulseaudio/libpulsecommon-8.0.so: usr/lib/libpulsecommon-8.0.so # 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/bios-256k.bin: qemu/bios-256k.bin
usr/share/seabios/vgabios-stdvga.bin: qemu/vgabios-stdvga.bin # usr/share/seabios/vgabios-stdvga.bin: qemu/vgabios-stdvga.bin
usr/share/seabios/kvmvapic.bin: qemu/kvmvapic.bin # usr/share/seabios/kvmvapic.bin: qemu/kvmvapic.bin
usr/lib/ipxe/qemu/efi-virtio.rom: qemu/efi-virtio.rom # usr/lib/ipxe/qemu/efi-virtio.rom: qemu/efi-virtio.rom
kvm-support: kvm-support:
plugin: nil plugin: nil
@ -533,7 +533,8 @@ parts:
- try: [msr-tools] - try: [msr-tools]
libvirt: libvirt:
source: https://libvirt.org/sources/libvirt-4.6.0.tar.xz source: .
source-subdir: libvirt-1.3.1
plugin: autotools plugin: autotools
build-packages: build-packages:
- libxml2-dev - libxml2-dev
@ -553,8 +554,8 @@ parts:
- libnl-route-3-dev - libnl-route-3-dev
- uuid-dev - uuid-dev
- try: [libnuma-dev] - try: [libnuma-dev]
- xsltproc - wget
- libjansson-dev - dpkg-dev
stage-packages: stage-packages:
- dmidecode - dmidecode
- dnsmasq - dnsmasq
@ -565,7 +566,6 @@ parts:
- try: [libnuma1] - try: [libnuma1]
- libcurl3-gnutls - libcurl3-gnutls
- libpciaccess0 - libpciaccess0
- libxml2-utils
configflags: configflags:
- --with-qemu - --with-qemu
- --without-bhyve - --without-bhyve
@ -592,6 +592,12 @@ parts:
- DMIDECODE=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/sbin/dmidecode - DMIDECODE=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/sbin/dmidecode
- OVSVSCTL=/snap/$SNAPCRAFT_PROJECT_NAME/current/bin/ovs-vsctl - OVSVSCTL=/snap/$SNAPCRAFT_PROJECT_NAME/current/bin/ovs-vsctl
- EBTABLES_PATH=/snap/$SNAPCRAFT_PROJECT_NAME/current/sbin/ebtables - 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: organize:
# Hack to shift installed libvirt back to root of snap # Hack to shift installed libvirt back to root of snap
# required to ensure that pathing to files etc works at # required to ensure that pathing to files etc works at