86a3dd56d6
- fence_brocade: Add support for 'list' action - fencing: Monitor is not working correctly without 'list' or 'status' - fence_apc_snmp: Add support for firmware 6.x - fence_zvm: Add support for "on" and "status" - fence_zvm: Add current XML metadata to test suite - [build] Fix automake files, so 'make distcheck' works - fencing: Add new options --ssl-secure and --ssl-insecure - [tests] Update XML metadata of fence agents - fence_cisco_ucs & fence_vmware_soap: Logout has to be performed even when fencing fails - fence_zvm: Fixes for better upstream inclusion - fence_zvm: Add support for 'on', improve documentation - Added patches: - 0001-fence_brocade-Add-support-for-list-action.patch - 0002-fencing-Monitor-is-not-working-correctly-without-lis.patch - 0003-fence_apc_snmp-Add-support-for-firmware-6.x.patch - 0004-fence_zvm-Add-support-for-on-and-status.patch - 0005-fence_zvm-Add-current-XML-metadata-to-test-suite.patch - 0006-build-Fix-automake-files-so-make-distcheck-works.patch - 0007-fencing-Add-new-options-ssl-secure-and-ssl-insecure.patch - 0008-tests-Update-XML-metadata-of-fence-agents.patch - 0009-fence_cisco_ucs-fence_vmware_soap-Logout-has-to-be-p.patch - 0010-fence_zvm-Fixes-for-better-upstream-inclusion.patch - 0011-fence_zvm-Add-support-for-on-improve-documentation.patch - Add dependency on python-requests OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=16
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From 3b3a7cf2d58fd863fef21553db5715c1dfab26a0 Mon Sep 17 00:00:00 2001
|
|
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
Date: Wed, 27 Aug 2014 15:18:01 +0200
|
|
Subject: [PATCH 06/11] [build] Fix automake files, so 'make distcheck' works
|
|
|
|
---
|
|
Makefile.am | 2 +-
|
|
fence/agents/Makefile.am | 3 +--
|
|
fence/agents/scsi/Makefile.am | 2 +-
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index e70dac5..5e2e22d 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -15,7 +15,7 @@ noinst_HEADERS = make/copyright.cf
|
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
-SUBDIRS = fence doc
|
|
+SUBDIRS = fence/agents/lib fence doc
|
|
|
|
install-exec-local:
|
|
$(INSTALL) -d $(DESTDIR)/$(LOGDIR)
|
|
diff --git a/fence/agents/Makefile.am b/fence/agents/Makefile.am
|
|
index c47f5d5..3b76b9a 100644
|
|
--- a/fence/agents/Makefile.am
|
|
+++ b/fence/agents/Makefile.am
|
|
@@ -1,4 +1,3 @@
|
|
MAINTAINERCLEANFILES = Makefile.in
|
|
|
|
-SUBDIRS = lib \
|
|
- $(AGENTS_LIST)
|
|
+SUBDIRS = $(AGENTS_LIST)
|
|
diff --git a/fence/agents/scsi/Makefile.am b/fence/agents/scsi/Makefile.am
|
|
index 5722e18..c113f06 100644
|
|
--- a/fence/agents/scsi/Makefile.am
|
|
+++ b/fence/agents/scsi/Makefile.am
|
|
@@ -20,4 +20,4 @@ include $(top_srcdir)/make/fenceman.mk
|
|
include $(top_srcdir)/make/agentpycheck.mk
|
|
|
|
clean-local: clean-man
|
|
- rm -f $(TARGET) $(SYMTARGET)
|
|
+ rm -f $(TARGET) $(SYMTARGET) fence_scsi_check
|
|
--
|
|
1.8.4.5
|
|
|