On 8/4/20 12:47 PM, Lukas Straub wrote:
> Optionally install the resouce-agent so it gets picked up by
> pacemaker.
This patch now needs to be rebased.
>
> Signed-off-by: Lukas Straub <lukasstra...@web.de>
> ---
> Makefile | 5 +++++
> configure | 10 ++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index c2120d8d48..dccc20b120 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -969,6 +969,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 2acc4d1465..39051d25f8 100755
> --- a/configure
> +++ b/configure
> @@ -438,6 +438,7 @@ softmmu="yes"
> linux_user="no"
> bsd_user="no"
> blobs="yes"
> +colo_ra="no"
> edk2_blobs="no"
> pkgversion=""
> pie=""
> @@ -1336,6 +1337,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"
> @@ -1821,6 +1826,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
> @@ -6930,6 +6936,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"
> @@ -7496,6 +7503,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
>
