[Debian-ha-commits] [fence-agents] 01/01: Remove fence_zvm on non-s390x, it's a no-op anyway.

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository fence-agents.

commit 9b75f8fbb66a4f37235219e121034c1e5eb602c1
Author: Christoph Berg <myon at debian.org>
Date:   Sat Feb 6 12:17:22 2016 +0100

    Remove fence_zvm on non-s390x, it's a no-op anyway.
---
 debian/changelog              |  1 +
 debian/patches/fence_zvm-help | 11 +++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  6 +++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6fd7b72..1052b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 fence-agents (4.0.22-2) UNRELEASED; urgency=medium
 
   * Grab missing fence_zvm.h from upstream.
+  * Remove fence_zvm on non-s390x, it's a no-op anyway.
 
  -- Christoph Berg <myon at debian.org>  Sat, 06 Feb 2016 11:56:31 +0100
 
diff --git a/debian/patches/fence_zvm-help b/debian/patches/fence_zvm-help
new file mode 100644
index 0000000..4be48cd
--- /dev/null
+++ b/debian/patches/fence_zvm-help
@@ -0,0 +1,11 @@
+--- a/fence/agents/zvm/fence_zvm.c
++++ b/fence/agents/zvm/fence_zvm.c
+@@ -853,7 +853,7 @@ usage()
+ 		"\t-T --timeout [secs]  - Time to wait for fence in seconds - currently ignored\n"
+ 		"\t--zvmsys [node]      - z/VM Node on which SMAPI server lives\n"
+ 		"\t-h --help            - Display this usage information\n");
+-	return(1);
++	return(0);
+ }
+ 
+ /**
diff --git a/debian/patches/series b/debian/patches/series
index 2433963..5153f79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 reproducible
 vgs-path
 fence_zvm.h
+fence_zvm-help
diff --git a/debian/rules b/debian/rules
index 3edfd15..ffde130 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,15 @@ override_dh_install:
 	rm -v debian/tmp/usr/share/doc/fence-agents/COPY*
 	rm -v debian/tmp/usr/share/doc/fence-agents/README.licence
 	rmdir debian/tmp/usr/share/doc/fence-agents
+ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),s390x)
+	# remove fence_zvm because it doesn't do anything except on 390x
+	rm -v debian/tmp/usr/sbin/fence_zvm debian/tmp/usr/share/man/man8/fence_zvm.8
+endif
 	dh_install --fail-missing
 	# test agents (skip ack_manual, it doesn't have --help, skip vmware_helper, it wants VIRuntime.pm)
 	# we test in tmp after install so the .pyc files generated don't make it into the package
 	for agent in debian/tmp/usr/sbin/*; do \
-		case $${agent##*/} in fence_ack_manual|fence_vmware_helper|fence_zvm) continue;; esac; \
+		case $${agent##*/} in fence_ack_manual|fence_vmware_helper) continue;; esac; \
 		echo "Testing $$agent"; \
 		PYTHONPATH=debian/tmp/usr/share/fence $$agent --help >/dev/null || exit; \
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/fence-agents.git