From: Lukas Straub <lukasstraub2@web.de>
To: qemu-devel <qemu-devel@nongnu.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Alberto Garcia" <berto@igalia.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Zhang Chen" <chen.zhang@intel.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 6/7] configure,Makefile: Install colo resource-agent
Date: Sat, 6 Jun 2020 21:18:16 +0200 [thread overview]
Message-ID: <a1ec11b307ce158a6101c4fe30a9cb4591d29004.1591456338.git.lukasstraub2@web.de> (raw)
In-Reply-To: <cover.1591456338.git.lukasstraub2@web.de>
[-- Attachment #1: Type: text/plain, Size: 2452 bytes --]
Optionally install the resouce-agent so it gets picked up by
pacemaker.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
Makefile | 5 +++++
configure | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/Makefile b/Makefile
index 8a9113e666..2ebffc4465 100644
--- a/Makefile
+++ b/Makefile
@@ -973,6 +973,11 @@ ifneq ($(DESCS),)
$(INSTALL_DATA) "$$tmpf" \
"$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \
done
+endif
+ifdef INSTALL_COLO_RA
+ mkdir -p "$(DESTDIR)$(libdir)/ocf/resource.d/qemu"
+ $(INSTALL_PROG) "scripts/colo-resource-agent/colo" \
+ "$(DESTDIR)$(libdir)/ocf/resource.d/qemu/colo"
endif
for s in $(ICON_SIZES); do \
mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
diff --git a/configure b/configure
index 23b5e93752..c9252030cf 100755
--- a/configure
+++ b/configure
@@ -430,6 +430,7 @@ softmmu="yes"
linux_user="no"
bsd_user="no"
blobs="yes"
+colo_ra="no"
edk2_blobs="no"
pkgversion=""
pie=""
@@ -1309,6 +1310,10 @@ for opt do
;;
--disable-blobs) blobs="no"
;;
+ --disable-colo-ra) colo_ra="no"
+ ;;
+ --enable-colo-ra) colo_ra="yes"
+ ;;
--with-pkgversion=*) pkgversion="$optarg"
;;
--with-coroutine=*) coroutine="$optarg"
@@ -1776,6 +1781,7 @@ Advanced options (experts only):
--enable-gcov enable test coverage analysis with gcov
--gcov=GCOV use specified gcov [$gcov_tool]
--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
@@ -6647,6 +6653,7 @@ echo "Linux AIO support $linux_aio"
echo "Linux io_uring support $linux_io_uring"
echo "ATTR/XATTR support $attr"
echo "Install blobs $blobs"
+echo "Install COLO resource agent $colo_ra"
echo "KVM support $kvm"
echo "HAX support $hax"
echo "HVF support $hvf"
@@ -7188,6 +7195,9 @@ fi
if test "$blobs" = "yes" ; then
echo "INSTALL_BLOBS=yes" >> $config_host_mak
fi
+if test "$colo_ra" = "yes" ; then
+ echo "INSTALL_COLO_RA=yes" >> $config_host_mak
+fi
if test "$iovec" = "yes" ; then
echo "CONFIG_IOVEC=y" >> $config_host_mak
fi
--
2.20.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-06-06 19:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-06 19:17 [PATCH v2 0/7] colo: Introduce resource agent and test suite/CI Lukas Straub
2020-06-06 19:17 ` [PATCH v2 1/7] block/quorum.c: stable children names Lukas Straub
2020-06-06 19:17 ` [PATCH v2 2/7] avocado_qemu: Introduce pick_qemu_util to pick qemu utility binaries Lukas Straub
2020-06-06 19:18 ` [PATCH v2 3/7] boot_linux.py: Use pick_qemu_util Lukas Straub
2020-06-06 19:18 ` [PATCH v2 4/7] colo: Introduce resource agent Lukas Straub
2020-06-06 19:18 ` [PATCH v2 5/7] colo: Introduce high-level test suite Lukas Straub
2020-06-06 19:18 ` Lukas Straub [this message]
2020-06-06 19:18 ` [PATCH v2 7/7] MAINTAINERS: Add myself as maintainer for COLO resource agent Lukas Straub
2020-07-05 9:37 ` [PATCH v2 0/7] colo: Introduce resource agent and test suite/CI Lukas Straub
2020-07-14 14:33 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a1ec11b307ce158a6101c4fe30a9cb4591d29004.1591456338.git.lukasstraub2@web.de \
--to=lukasstraub2@web.de \
--cc=berto@igalia.com \
--cc=chen.zhang@intel.com \
--cc=crosa@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).