From 41315f6c32e2a8fdd788ef18026133b65c723b58 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Wed, 5 Nov 2014 17:12:20 +0000
Subject: WIP:Update libvirt, enable its systemd services and add dependencies

Changes made:
  - Update libvirt and libvirt-python to v1.2.10
  - Add ebtables and dmidecode needed by libvirt on runtime.
  - Change libvirt chunk morphology:
      - Build it using its submodule.
      - Reformat the configure command.
---
 strata/virtualization.morph           | 21 +++++++++++++++++----
 strata/virtualization/dmidecode.morph |  7 +++++++
 strata/virtualization/ebtables.morph  |  7 +++++++
 strata/virtualization/libvirt.morph   | 19 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 strata/virtualization/dmidecode.morph
 create mode 100644 strata/virtualization/ebtables.morph

diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 68be204a..44cbdf31 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -46,17 +46,24 @@ chunks:
   unpetrify-ref: master
   build-depends:
   - xorg-util-macros
+- name: dmidecode
+  morph: strata/virtualization/dmidecode.morph
+  repo: git://85.199.252.93/delta/dmidecode.git
+  ref: 6d6e2504298cc0ff346eb55d10503d1795b34c56
+  unpetrify-ref: master
+  build-depends: []
 - name: libvirt
   morph: strata/virtualization/libvirt.morph
   repo: upstream:libvirt
-  ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
-  unpetrify-ref: baserock/morph
+  ref: e3ea7baf6a6e5625cea7b20c911c4333b79e72e2
+  unpetrify-ref: baserock/v1.2.10
   build-depends:
   - libpciaccess
   - dnsmasq
   - qemu
   - xml-catalog
   - yajl
+  - dmidecode
 - name: pycurl
   repo: upstream:pycurl
   ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
@@ -81,8 +88,8 @@ chunks:
   - cython
 - name: libvirt-python
   repo: upstream:libvirt-python
-  ref: 4382fc518cbd11d9af5727fb403e175818c25db5
-  unpetrify-ref: v1.2.2
+  ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500
+  unpetrify-ref: v1.2.10
   build-depends:
   - libvirt
   - python-lxml
@@ -121,3 +128,9 @@ chunks:
   build-depends:
   - libvirt-python
   - libosinfo
+- name: ebtables
+  morph: strata/virtualization/ebtables.morph
+  repo: git://85.199.252.93/delta/ebtables.git
+  ref: 09792f0107a9318da809908db31f0b826017de7b
+  unpetrify-ref: master
+  build-depends: []
diff --git a/strata/virtualization/dmidecode.morph b/strata/virtualization/dmidecode.morph
new file mode 100644
index 00000000..d9ab0fa3
--- /dev/null
+++ b/strata/virtualization/dmidecode.morph
@@ -0,0 +1,7 @@
+name: dmidecode
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" prefix="$PREFIX"
diff --git a/strata/virtualization/ebtables.morph b/strata/virtualization/ebtables.morph
new file mode 100644
index 00000000..8be1b4f2
--- /dev/null
+++ b/strata/virtualization/ebtables.morph
@@ -0,0 +1,7 @@
+name: ebtables
+kind: chunk
+build-system: manual
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR" BINDIR="$DESDIR"/sbin
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph
index 63b5d768..9b4e9b1f 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.morph
@@ -3,4 +3,21 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - |
-  GNULIB_SRCDIR=gnulib-src ./autogen.sh --without-apparmor --with-attr --without-audit --without-avahi --with-blkid --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs --without-hal --without-netcf --without-numactl --without-openwsman --with-pciaccess --without-readline --without-sanlock --without-sasl --without-selinux --without-ssh2 --with-systemd-daemon --with-udev --with-yajl --without-xen --with-qemu --without-uml --without-openvz --without-vmware --without-phyp --without-xenapi --without-libxl --without-vbox --without-lxc --without-esx --without-hyperv --without-parallels --with-test --with-remote --with-libvirtd --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit --without-firewalld --without-dtrace --without-numad --with-network --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --with-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-wireshark-dissector --with-python --prefix="$PREFIX"
+  GNULIB_SRCDIR=.gnulib \
+  ./autogen.sh \
+  --without-apparmor --with-attr --without-audit --without-avahi --with-blkid \
+  --without-capng --with-curl --with-dbus --with-fuse --without-glusterfs \
+  --without-hal --without-netcf --without-numactl --without-openwsman \
+  --with-pciaccess --without-readline --without-sanlock --without-sasl \
+  --without-selinux --without-ssh2 --with-systemd-daemon --with-udev \
+  --with-yajl --without-xen --with-qemu --without-uml --without-openvz \
+  --without-vmware --without-phyp --without-xenapi --without-libxl \
+  --without-vbox --without-lxc --without-esx --without-hyperv \
+  --without-parallels --with-test --with-remote --with-libvirtd \
+  --with-init-script=systemd --without-bhyve --without-gnutls --without-polkit \
+  --without-firewalld --without-dtrace --without-numad --with-network \
+  --with-secrets --with-storage-dir --with-storage-fs --with-storage-lvm \
+  --without-storage-iscsi --without-storage-scsi --without-storage-mpath \
+  --without-storage-disk --with-storage-rbd --without-storage-sheepdog \
+  --without-storage-gluster --without-wireshark-dissector --with-python \
+  --prefix="$PREFIX"
-- 
cgit v1.2.1