public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: fence-agents: master - build: enable fence_xvm by default Date: Tue, 23 Jun 2009 04:24:00 -0000 [thread overview] Message-ID: <20090623042312.70DDB1201EF@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=30f8c3188aee00402161ba657e7916e5ca88ebbf Commit: 30f8c3188aee00402161ba657e7916e5ca88ebbf Parent: 35690c5f27a2dbffa101128129b6d3859f72452b Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Tue Jun 23 06:18:19 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Tue Jun 23 06:23:04 2009 +0200 build: enable fence_xvm by default Historically building fence_xvm was complex and required xen libs that are architecture specific. fence_xvm has long dropped libxen in favour of libvirt that's been ported and build on all architecture and it's part of all distribution. Drop the special casing in the build system. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- configure | 10 +--------- fence/agents/Makefile | 13 +------------ make/defines.mk.input | 1 - 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 9973a29..6681a3c 100755 --- a/configure +++ b/configure @@ -52,7 +52,6 @@ my %options = ( fenceagentslibdir => \$fenceagentslibdir, enable_crack_of_the_day => \$enable_crack_of_the_day, enable_legacy_code => \$enable_legacy_code, - enable_virt => \$enable_virt, release_version => \$release_version, ); @@ -95,8 +94,7 @@ my $err = &GetOptions (\%options, 'fence_agents=s', 'fenceagentslibdir=s', 'enable_crack_of_the_day', - 'enable_legacy_code', - 'enable_virt'); + 'enable_legacy_code'); if(!$err) { $ret = 1; @@ -149,7 +147,6 @@ if ($help || !$err) { print "--fenceagentslibdir=\tspecify directory where to install common fence python lib. (Default: {prefix}/share/fence)\n"; print "--enable_crack_of_the_day\tEnable build of highly experimental features that rely on code that is not yet available for general use. (Default: no)\n"; print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n"; - print "--enable_virt\tEnable building of virtualization code (Default: disabled)\n"; exit $ret; } @@ -317,9 +314,6 @@ if (!$enable_legacy_code) { print "\n********************************************************************************************\n"; $cflags="${cflags} -DLEGACY_CODE"; } -if (!$enable_virt) { - $enable_virt=""; -} if (defined($release_version) && not length $release_version) { $release_version=""; } @@ -344,7 +338,6 @@ if ($fence_agents eq "help") { if ((!$fence_agents) || ($fence_agents eq "all")) { print "\nThe following fence agents will be build on this system:\n$all_fence\n"; - print "\nNOTE: xvm will build only if --enable_virt has been specified\n\n"; $fence_agents = $all_fence } @@ -389,7 +382,6 @@ while (<IFILE>) { $_ =~ s/\@FENCEAGENTSLIBDIR\@/$fenceagentslibdir/; $_ =~ s/\@ENABLE_CRACK_OF_THE_DAY\@/$enable_crack_of_the_day/; $_ =~ s/\@ENABLE_LEGACY_CODE\@/$enable_legacy_code/; - $_ =~ s/\@ENABLE_VIRT\@/$enable_virt/; print OFILE "$_\n"; } diff --git a/fence/agents/Makefile b/fence/agents/Makefile index 067d43a..eab0664 100644 --- a/fence/agents/Makefile +++ b/fence/agents/Makefile @@ -1,15 +1,4 @@ include ../../make/defines.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS = ${fence_agents} lib nss_wrapper - -all: ${SUBDIRS} - -%: - set -e && \ - for i in ${SUBDIRS}; do \ - if [ "$$i" = "xvm" ] && [ "${enable_virt}" != "1" ] && [ "$@" != "clean" ]; then \ - continue; \ - else \ - ${MAKE} -C $$i $@; \ - fi; \ - done diff --git a/make/defines.mk.input b/make/defines.mk.input index 370cbd9..4cd4353 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -41,7 +41,6 @@ fence_agents ?= @FENCE_AGENTS@ fenceagentslibdir ?= @FENCEAGENTSLIBDIR@ experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@ legacy_code ?= @ENABLE_LEGACY_CODE@ -enable_virt ?= @ENABLE_VIRT@ THISDIR = $(shell echo $(CURDIR) | sed -e 's|$(OBJDIR)/||g') S=$(SRCDIR)/$(THISDIR)
reply other threads:[~2009-06-23 4:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090623042312.70DDB1201EF@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).