summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-12 16:11:57 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-13 16:18:32 +0000
commit4c0c8335625b123f383b7bf3f45f206e6219d305 (patch)
treeac46d386e12ad164f6e042fa7284bf2417467aeb
parent898c63f66702b26ec3376f48aeeacccfd85796fc (diff)
downloaddefinitions-4c0c8335625b123f383b7bf3f45f206e6219d305.tar.gz
Update libvirt and libvirt-python
- Update libvirt and libvirt-python to 1.2.10. - Modify libvirt chunk: - Build libvirt using its submodule. - Reformat the configure command. - Create the libvirt group - Give the permissions to the libvirt group to read and write unix sockets. - Add lvm stratum required for libvirt to compile. - Add dmidecode and ebtables required for libvirt on runtime.
-rw-r--r--strata/virtualization.morph22
-rw-r--r--strata/virtualization/dmidecode.morph7
-rw-r--r--strata/virtualization/ebtables.morph7
-rw-r--r--strata/virtualization/libvirt.morph27
4 files changed, 58 insertions, 5 deletions
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 7aa8f6af..9dc98031 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -3,6 +3,7 @@ kind: stratum
description: virtualization for baserock
build-depends:
- morph: strata/connman-common.morph
+- morph: strata/lvm.morph
chunks:
- name: yajl
morph: strata/virtualization/yajl.morph
@@ -39,17 +40,24 @@ chunks:
unpetrify-ref: master
build-depends:
- xorg-util-macros
+- name: dmidecode
+ morph: strata/virtualization/dmidecode.morph
+ repo: upstream:dmidecode
+ ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5
+ unpetrify-ref: master
+ build-depends: []
- name: libvirt
morph: strata/virtualization/libvirt.morph
repo: upstream:libvirt
- ref: 13b7bb4acba9b70e015b7faa020b08018885aad8
- unpetrify-ref: baserock/morph
+ ref: 7b1ceec1e2f141d36ed9b7ef3a660ff8bb34fc53
+ unpetrify-ref: baserock/v1.2.10
build-depends:
- libpciaccess
- dnsmasq
- qemu
- xml-catalog
- yajl
+ - dmidecode
- name: pycurl
repo: upstream:pycurl
ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
@@ -74,8 +82,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
@@ -114,3 +122,9 @@ chunks:
build-depends:
- libvirt-python
- libosinfo
+- name: ebtables
+ morph: strata/virtualization/ebtables.morph
+ repo: upstream:ebtables
+ 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..e6d348bb 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.morph
@@ -3,4 +3,29 @@ 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 \
+ --prefix="$PREFIX"
+system-integration:
+ libvirt-misc:
+ 01-addgroup:
+ - groupadd libvirt
+ 02-setup_libvirtconf:
+ - sed -i 's/#unix_sock_group = "libvirt"/unix_sock_group = "libvirt"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_rw_perms = "0770"/unix_sock_rw_perms = "0770"/' /etc/libvirt/libvirtd.conf
+ - sed -i 's/#unix_sock_ro_perms = "0777"/unix_sock_ro_perms = "0777"/' /etc/libvirt/libvirtd.conf