Skip to content

Commit 67e283c

Browse files
author
Arnon Yaari
committed
HOSTDEV-2780 add libvirt (only redhat x64 distros)
1 parent f463eea commit 67e283c

5 files changed

Lines changed: 25 additions & 0 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[buildout]
2+
extends = buildout-build-redhat-64bit.cfg
3+
parts = zlib ncurses readline openssl openssh libgpg-error libgcrypt gettext libiconv libgnutls bzip2 sqlite3 db libxml2 libxslt libffi gdbm cyrus-sasl libevent libev zeromq openldap graphviz device-mapper libvirt python
4+
5+
[device-mapper]
6+
<= options
7+
gnu
8+
recipe = hexagonit.recipe.cmmi
9+
version = 1.02.28
10+
configure-options = --prefix=${options:prefix} --disable-rpath --libdir=${options:prefix}/lib64 --disable-selinux
11+
12+
[libvirt]
13+
<= options
14+
gnu
15+
recipe = hexagonit.recipe.cmmi
16+
version = 3.9.0
17+
configure-options = ${options:configure-options} --without-macvtap --without-yajl

buildout-build-redhat-64bit.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ SHARED_LDFLAGS = -L${options:prefix}/lib64 -Wl,-rpath,-rpath,\$$ORIGIN,\$$ORIGIN
1414
LIBPATH = -L${options:prefix}/lib64
1515
DYLD_LIBRARY_PATH = ${options:prefix}/lib64
1616
LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
17+
PKG_CONFIG_PATH = ${options:prefix}/lib64/pkgconfig
1718

1819
[openssl]
1920
configure-options = --prefix=${options:prefix} --openssldir=${:openssldir} --shared --libdir=lib64 -fPIC -Wl,-rpath,\\\$\$\$\$\\\$\$\$\$ORIGIN/../lib

buildout-build-solaris-64bit.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ SHARED_LDFLAGS = -L${options:prefix}/lib64 -Wl,-rpath,\$$ORIGIN,-rpath,\$$ORIGIN
1515
LIBPATH = -L${options:prefix}/lib64
1616
DYLD_LIBRARY_PATH = ${options:prefix}/lib64
1717
LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
18+
PKG_CONFIG_PATH = ${options:prefix}/lib64/pkgconfig
1819
CFLAGS = -I${options:prefix}/include -m64
1920
CPPFLAGS = ${:CFLAGS}
2021
CXXFLAGS = ${:CFLAGS}

buildout-build.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ CPPFLAGS = ${:CFLAGS}
4545
LIBPATH = -L${options:prefix}/lib
4646
DYLD_LIBRARY_PATH = ${options:prefix}/lib
4747
LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
48+
PKG_CONFIG_PATH = ${options:prefix}/lib/pkgconfig
4849

4950
[zlib]
5051
<= options-no-rpath

src/scripts/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ def build():
5050
buildout_file = 'buildout-build-redhat-ppc64.cfg'
5151
elif 'i386' in arch:
5252
buildout_file = 'buildout-build-redhat-32bit.cfg'
53+
elif int(version.split(".")[0]) > 6 or \
54+
(int(version.split(".")[0]) == 6 and int(version.split(".")[1]) >= 4):
55+
# arch is 64 bit and supports libvirt
56+
buildout_file = 'buildout-build-redhat-64bit-with-libvirt.cfg'
5357
else:
58+
# arch is 64 bit
5459
buildout_file = 'buildout-build-redhat-64bit.cfg'
5560
if dist_name in ['suse']:
5661
arch = execute_assert_success(["uname", "-i"]).get_stdout().lower()

0 commit comments

Comments
 (0)