[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 5/6] configure,Makefile: Install colo resource-agent
From: |
Lukas Straub |
Subject: |
[PATCH v4 5/6] configure,Makefile: Install colo resource-agent |
Date: |
Sun, 7 Feb 2021 16:55:36 +0100 |
Optionally install the resouce-agent so it gets picked up by
pacemaker.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
configure | 7 +++++++
meson.build | 5 +++++
meson_options.txt | 2 ++
3 files changed, 14 insertions(+)
diff --git a/configure b/configure
index a34f91171d..54fc7e533f 100755
--- a/configure
+++ b/configure
@@ -382,6 +382,7 @@ softmmu="yes"
linux_user="no"
bsd_user="no"
blobs="true"
+install_colo_ra="false"
pkgversion=""
pie=""
qom_cast_debug="yes"
@@ -1229,6 +1230,10 @@ for opt do
;;
--disable-blobs) blobs="false"
;;
+ --disable-colo-ra) install_colo_ra="false"
+ ;;
+ --enable-colo-ra) install_colo_ra="true"
+ ;;
--with-pkgversion=*) pkgversion="$optarg"
;;
--with-coroutine=*) coroutine="$optarg"
@@ -1772,6 +1777,7 @@ Advanced options (experts only):
ucontext, sigaltstack, windows
--enable-gcov enable test coverage analysis with gcov
--disable-blobs disable installing provided firmware blobs
+ --enable-colo-ra enable installing the COLO resource agent for
pacemaker
--with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
--with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
--tls-priority default TLS protocol/cipher priority string
@@ -6414,6 +6420,7 @@ NINJA=$ninja $meson setup \
-Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
-Dattr=$attr -Ddefault_devices=$default_devices \
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
+ -Dinstall_colo_ra=$install_colo_ra \
-Dvhost_user_blk_server=$vhost_user_blk_server \
-Dfuse=$fuse -Dfuse_lseek=$fuse_lseek
-Dguest_agent_msi=$guest_agent_msi \
$(if test "$default_features" = no; then echo
"-Dauto_features=disabled"; fi) \
diff --git a/meson.build b/meson.build
index 2d8b433ff0..82efa75e36 100644
--- a/meson.build
+++ b/meson.build
@@ -2263,6 +2263,10 @@ elif get_option('guest_agent_msi').enabled()
error('Guest agent MSI requested, but the guest agent is not being built')
endif
+if get_option('install_colo_ra')
+ install_data('scripts/colo-resource-agent/colo', install_dir:
get_option('libdir') / 'ocf/resource.d/qemu')
+endif
+
# Don't build qemu-keymap if xkbcommon is not explicitly enabled
# when we don't build tools or system
if xkbcommon.found()
@@ -2398,6 +2402,7 @@ summary_info += {'system-mode emulation': have_system}
summary_info += {'user-mode emulation': have_user}
summary_info += {'block layer': have_block}
summary_info += {'Install blobs': get_option('install_blobs')}
+summary_info += {'Install COLO resource agent': get_option('install_colo_ra')}
summary_info += {'module support': config_host.has_key('CONFIG_MODULES')}
if config_host.has_key('CONFIG_MODULES')
summary_info += {'alternative module path':
config_host.has_key('CONFIG_MODULE_UPGRADES')}
diff --git a/meson_options.txt b/meson_options.txt
index 95f1079829..907d5dff61 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,6 +15,8 @@ option('gettext', type : 'feature', value : 'auto',
description: 'Localization of the GTK+ user interface')
option('install_blobs', type : 'boolean', value : true,
description: 'install provided firmware blobs')
+option('install_colo_ra', type : 'boolean', value : false,
+ description: 'install the COLO resource agent for pacemaker')
option('sparse', type : 'feature', value : 'auto',
description: 'sparse checker')
option('guest_agent_msi', type : 'feature', value : 'auto',
--
2.30.0
pgp76OId6dXl5.pgp
Description: OpenPGP digital signature
- [PATCH v4 0/6] colo: Introduce resource agent and test suite/CI, Lukas Straub, 2021/02/07
- [PATCH v4 1/6] avocado_qemu: Introduce pick_qemu_util to pick qemu utility binaries, Lukas Straub, 2021/02/07
- [PATCH v4 2/6] boot_linux.py: Use pick_qemu_util, Lukas Straub, 2021/02/07
- [PATCH v4 3/6] colo: Introduce resource agent, Lukas Straub, 2021/02/07
- [PATCH v4 4/6] colo: Introduce high-level test suite, Lukas Straub, 2021/02/07
- [PATCH v4 5/6] configure,Makefile: Install colo resource-agent,
Lukas Straub <=
- [PATCH v4 6/6] MAINTAINERS: Add myself as maintainer for COLO resource agent, Lukas Straub, 2021/02/07