From 4c0c8335625b123f383b7bf3f45f206e6219d305 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 16:11:57 +0000 Subject: 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. --- strata/virtualization.morph | 22 ++++++++++++++++++---- strata/virtualization/dmidecode.morph | 7 +++++++ strata/virtualization/ebtables.morph | 7 +++++++ strata/virtualization/libvirt.morph | 27 ++++++++++++++++++++++++++- 4 files changed, 58 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 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 -- cgit v1.2.1 From 8e69e14f89ffd891265a774e7f6823744549b019 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 16:19:31 +0000 Subject: Update gnome-common to 3.12.0 --- strata/virtualization.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 9dc98031..857a111d 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -90,8 +90,8 @@ chunks: - urlgrabber - name: gnome-common repo: upstream:gnome-common - ref: 766c35359ef924ceb2288c14c2d6239fcc0618f8 - unpetrify-ref: 3.7.4 + ref: d213283fcb5228d05eb2c796579f18240e8467e8 + unpetrify-ref: 3.12.0 build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph -- cgit v1.2.1 From f300dae54a5fd6bebbe33b21c5171cb6f18a45cd Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 16:23:37 +0000 Subject: Add openvswitch to virtualization stratum --- strata/virtualization.morph | 6 ++++++ strata/virtualization/openvswitch.morph | 11 +++++++++++ 2 files changed, 17 insertions(+) create mode 100644 strata/virtualization/openvswitch.morph diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 857a111d..b7cdceca 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -128,3 +128,9 @@ chunks: ref: 09792f0107a9318da809908db31f0b826017de7b unpetrify-ref: master build-depends: [] +- name: openvswitch + morph: strata/virtualization/openvswitch.morph + repo: upstream:openvswitch + ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f + unpretrify-ref: master + build-depends: [] diff --git a/strata/virtualization/openvswitch.morph b/strata/virtualization/openvswitch.morph new file mode 100644 index 00000000..1b5cdd86 --- /dev/null +++ b/strata/virtualization/openvswitch.morph @@ -0,0 +1,11 @@ +name: openvswitch +kind: chunk +build-system: manual +pre-configure-commands: +- ./boot.sh +configure-commands: +- ./configure --enable-ssl +build-commands: +- make +install-commands: +- make install DESTDIR="$DESTDIR" prefix="$PREFIX" -- cgit v1.2.1 From 1e38ff99eb9a005e0867c34b63232f6cb2a566cd Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 16:38:13 +0000 Subject: Update qemu to 2.2.0 for compiling with latest gcc --- strata/virtualization.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/virtualization.morph b/strata/virtualization.morph index b7cdceca..7ea783c0 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -26,8 +26,8 @@ chunks: - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu - ref: f8d1fb61e65575011a67d7ba97b690feb5630c91 - unpetrify-ref: baserock/morph + ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d + unpetrify-ref: baserock/v2.2.0 build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros -- cgit v1.2.1 From bc5300f4a1c11bc2e181cabc40a7e1033e63f37d Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 16:38:44 +0000 Subject: Update description to point that this stratum needs kernel support for some packages --- strata/virtualization.morph | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 7ea783c0..881b53de 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -1,6 +1,10 @@ name: virtualization kind: stratum -description: virtualization for baserock +description: | + Virtualization for baserock + NOTE: this stratum requires kernel support, please see openstack bsp + kernel history to check which config are needed for openvswitch, libvirt, + or ebtables, for example. build-depends: - morph: strata/connman-common.morph - morph: strata/lvm.morph -- cgit v1.2.1