Merge ~lucaskanashiro/ubuntu/+source/fence-agents:merge-kinetic into ubuntu/+source/fence-agents:debian/sid

[Lucas Kanashiro]

Merge version 4.7.1-1 from Debian unstable. All the delta to split the agents into -base and -extra was kept, plus some more changes to support the 2 new binaries introduced by Debian.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-stack/+packages

autopkgtest summary:

autopkgtest [14:58:19]: @@@@@@@@@@@@@@@@@@@@ summary
metadata PASS
delay PASS
fence-dummy PASS
fence-aws SKIP exit status 77 and marked as skippable
command1 PASS
command2 PASS

[Bryce Harrington (bryce)]

All logical changes are represented in git history. Some of the lines don't mention the affected files, so e.g. d/control, d/rules, d/fence-agents.install, etc. could be added. However, that's probably better to leave to next merge.

I wonder also if some of these changes could be squashed together, e.g. the d/curated-agents might ok to collect together. Again, not worth dealing with for kinetic but maybe next merge.

Some of the changes sound like they might be acceptable to Debian, has there been efforts to push them up?

The new change this merge, fixing installation, LGTM

Autopkgtest looks good:

$ lp-test-ppa ppa:lucaskanashiro/ha-stack -r kinetic -p fence-agents
  fence-agents @ amd64:
    09.08.22 21:08:48 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2
  fence-agents @ arm64:
    09.08.22 21:33:29 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2
  fence-agents @ armhf:
    09.08.22 21:22:00 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2
    09.08.22 22:17:12 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2
  fence-agents @ ppc64el:
    09.08.22 21:15:48 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2
  fence-agents @ s390x:
    09.08.22 21:16:04 Log 🗒️ ✅ Triggers: fence-agents/4.11.0-1ubuntu1~ppa2

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lucaskanashiro, bryce
Uploaders: lucaskanashiro, bryce
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

(Sorry, I had reviewed this yesterday but had a system lockup that morning. I thought I'd saved the review before the crash but apparently not.)

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Bryce. I'll be considering your suggestions in the next merge.

Package uploaded:

Uploading fence-agents_4.11.0-1ubuntu1.dsc
Uploading fence-agents_4.11.0.orig.tar.gz
Uploading fence-agents_4.11.0-1ubuntu1.debian.tar.xz
Uploading fence-agents_4.11.0-1ubuntu1_source.buildinfo
Uploading fence-agents_4.11.0-1ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 0c8d40b..f34d61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+fence-agents (4.11.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971275). Remaining changes:
+    - d/t/delay: Reduce minimum delay when running on ppc64el.
+    - d/rules: install files in debian/fence-agents instead of debian/tmp.
+    - Create the fence-agents-common binary package with files to be
+      shared by agents.
+    - Create the fence-agents-base binary package.
+      To add a new curated agent it should be added to debian/curated-agents
+      file in a new line.
+    - Update the way agents description are added to the package
+      description to support the split.
+    - Rename fence-agents with non-curated agents to fence-agents-extra.
+    - Create a transitional binary package called fence-agents.
+      It depends on both fence-agents-{base,extra}.
+    - d/control: Add missing Breaks/Replaces to the fence-agents-base.
+    - d/curated-agents: add fence_scsi to the -base package.
+    - d/curated-agents: add fence_mpath to the -base package.
+    - d/rules: do not install /var/run directory anymore.
+      This was causing a lintian error because of the /var/run/cluster
+      directory created by the upstream build system. The needed files in
+      /var/run should be created by the agents during runtime.
+    - d/curated-agents: add fence_ipmilan and fence_sbd to the -base
+      package (LP #1965312).
+      Also add the following agents which are symlinks to fence_ipmilan:
+      fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm, and
+      fence_ipmilanplus.
+    - d/control: suggest dependecies of agents in the -base package
+      (LP #1863677).
+  * Added:
+    - Fix installation of fence-virt{,d} binary packages.
+
+ -- Lucas Kanashiro <[e-mail]>  Fri, 05 Aug 2022 14:48:47 -0300
+
 fence-agents (4.11.0-1) unstable; urgency=medium
 
   * New upstream version 4.11.0
@@ -13,6 +47,111 @@ fence-agents (4.11.0-1) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Sun, 01 May 2022 17:51:59 +0200
 
+fence-agents (4.7.1-1ubuntu8) jammy; urgency=medium
+
+  * d/curated-agents: add fence_ipmilan and fence_sbd to the -base package.
+    Also add the following agents which are symlinks to fence_ipmilan:
+    fence_idrac, fence_ilo3, fence_ilo4, fence_ilo5, fence_imm, and
+    fence_ipmilanplus (LP: #1965312).
+  * d/control: suggest dependecies of agents in the -base package (LP: #1863677)
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 17 Mar 2022 11:43:13 -0300
+
+fence-agents (4.7.1-1ubuntu7) impish; urgency=medium
+
+  * d/rules: do not install /var/run directory anymore.
+    This was causing a lintian error because of the /var/run/cluster
+    directory created by the upstream build system. The needed files in
+    /var/run should be created by the agents during runtime.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 28 Sep 2021 09:16:11 -0300
+
+fence-agents (4.7.1-1ubuntu6) impish; urgency=medium
+
+  * d/curated-agents: add fence_mpath to the -base package (LP: #1942368).
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 20 Jul 2021 10:53:33 -0300
+
+fence-agents (4.7.1-1ubuntu5) impish; urgency=medium
+
+  * d/curated-agents: add fence_scsi to the -base package.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 30 Jun 2021 16:54:03 -0300
+
+fence-agents (4.7.1-1ubuntu4) impish; urgency=medium
+
+  * Rename fence-agents with non-curated agents to fence-agents-extra.
+    - d/control: rename the fence-agents binary package to fence-agents-extra.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'unsupported' term to 'non-curated'.
+    - d/move-supported-agents: update the binary package name in the path used
+      to move files.
+    - d/rules:
+      + Rename FENCE_AGENTS_DIR to FENCE_AGENTS_EXTRA_DIR with the appropriate
+        path.
+      + Edit comments to avoid the term 'supported'.
+  * Rename fence-agent-supported with curated agents to fence-agents-base.
+    - d/control:
+      + Rename fence-agents-supported binary package to fence-agents-base.
+      + Update the short and long description to not use the 'supported' term.
+      + Rename the supportedAgents substvar to curatedAgents.
+    - d/curated-agents: new file, this is the renamed d/supported-agents file.
+    - d/extract-agents-description:
+      + Rename the package name used in the substvars filename.
+      + Rename all the occurrences of the 'supported' term to 'curated'.
+    - d/move-curated-agents: new file, this is the renamed
+      d/move-supported-agents script.
+    - d/rules:
+      + Call d/move-curated-agents instead of d/move-supported-agents.
+      + Edit comments to avoid the term 'supported'.
+  * Create a transitional binary package called fence-agents.
+    - d/control: add a new section for the transitional package, adding
+      fence-agents-{base,extra} as dependencies.
+  * d/control: add a missing Breaks/Replaces relation to the fence-agents-base.
+  * d/move-curated-agents: use readonly variables to store the binary
+    packages' path.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 12 May 2021 15:44:43 -0300
+
+fence-agents (4.7.1-1ubuntu3) impish; urgency=medium
+
+  * d/control: make fence-agents recommend fence-agents-supported.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 03 May 2021 09:14:56 -0300
+
+fence-agents (4.7.1-1ubuntu2) impish; urgency=medium
+
+  * d/rules: install files in debian/fence-agents instead of debian/tmp.
+  * d/install: removed, it is not needed.
+  * Create the fence-agents-common binary package with files to be shared by
+    the supported and unsupported agents.
+    - d/control: add a new paragraph for the new binary package and move some
+      runtime dependencies from fence-agents to fence-agents-common.
+    - d/rules: move the common code to the new binary package.
+  * Create the fence-agents-supported package
+    - d/control: add a new paragraph for the new binary package.
+    - d/move-supported-agents: added a shell script to manage the move of all
+      supported agents to the right binary package.
+    - d/rules: call the d/move-supported-agents shell script and also run the
+      checks for the agents in the new binary package.
+    - d/supported-agents: added a file with a list of the supported agents.
+  * Update the way agent descriptions are added to the package description to
+    support the split.
+    - d/control: added a new variable to generate the list of supported agents
+      during build time and fix the indentation.
+    - d/extract-agents-description: added a shell script to generate a list of
+      supported and unsupported agents with their description.
+    - d/rules: call the d/extract-agents-description script in dh_gencontrol.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 12 Apr 2021 18:27:29 -0300
+
+fence-agents (4.7.1-1ubuntu1) hirsute; urgency=medium
+
+  * d/t/delay: Reduce minimum delay when running on ppc64el.
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 26 Feb 2021 16:46:48 -0500
+
 fence-agents (4.7.1-1) unstable; urgency=medium
 
   * New upstream version 4.7.1
diff --git a/debian/control b/debian/control
index 4d07925..f87b827 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: fence-agents
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders: Adrian Vondendriesch <[e-mail]>,
            Valentin Vidic <[e-mail]>
 Build-Depends: autoconf,
@@ -40,18 +41,33 @@ Vcs-Browser: https://salsa.debian.org/ha-team/fence-agents
 Vcs-Git: https://salsa.debian.org/ha-team/fence-agents.git
 
 Package: fence-agents
+Architecture: all
+Section: oldlibs
+Depends: ${misc:Depends},
+         fence-agents-base (>= ${source:Version}),
+         fence-agents-extra (>= ${source:Version})
+Description: Transitional package for the fence-agents
+ Red Hat Fence Agents is a collection of scripts to handle remote
+ power management for several devices.  They allow failed or
+ unreachable nodes to be forcibly restarted and removed from the
+ cluster.
+ .
+ This is a transitional package which provides a set of curated
+ (fence-agents-base) and non-curated (fence-agents-extra) agents.
+
+Package: fence-agents-extra
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${python3:Depends}, ${shlibs:Depends},
+         fence-agents-common (>= ${source:Version}),
          python3-boto3,
          python3-googleapi,
          python3-oauth2client,
-         python3-pycurl,
-         python3-pexpect,
          python3-requests,
          python3-suds
-Breaks: cman (<= 3.0.12-2ubuntu4)
-Replaces: cman (<= 3.0.12-2ubuntu4)
-Recommends: libnet-telnet-perl,
+Breaks: cman (<= 3.0.12-2ubuntu4), fence-agents (<< 4.7.1-1ubuntu2)
+Replaces: cman (<= 3.0.12-2ubuntu4), fence-agents (<< 4.7.1-1ubuntu2)
+Recommends: fence-agents-base (>= ${source:Version}),
+            libnet-telnet-perl,
             openssh-client,
             sg3-utils,
             snmp
@@ -72,7 +88,7 @@ Description: Fence Agents for Red Hat Cluster
  cluster.
  .
  Fence agents included:
- ${agents}
+  ${agents}
 
 Package: fence-virt
 Architecture: any
@@ -100,3 +116,48 @@ Description: Pluggable fencing framework for virtual machines - daemon
  .
  This package contains the fence_virtd daemon to be used on the
  physical host.
+
+Package: fence-agents-base
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${python3:Depends},
+         fence-agents-common (>= ${source:Version})
+Suggests:
+# for fence_ipmilan (and its symlinks)
+         ipmitool,
+# for fence_mpath
+         multipath-tools,
+# for fence_sbd
+         sbd,
+# for fence_scsi
+         sg3-utils,
+# for fence_virsh
+         libvirt-clients
+Breaks: cman (<= 3.0.12-2ubuntu4), fence-agents (<< 4.7.1-1ubuntu2)
+Replaces: cman (<= 3.0.12-2ubuntu4), fence-agents (<< 4.7.1-1ubuntu2)
+Description: Fence Agents for Red Hat Cluster curated by Ubuntu
+ Red Hat Fence Agents is a collection of scripts to handle remote
+ power management for several devices.  They allow failed or
+ unreachable nodes to be forcibly restarted and removed from the
+ cluster.
+ .
+ This package contains the Fence Agents that are curated by the Ubuntu
+ Server team.
+ .
+ Fence agents included:
+  ${curatedAgents}
+
+Package: fence-agents-common
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends},
+         python3-pexpect,
+         python3-pycurl
+Breaks: fence-agents (<< 4.7.1-1ubuntu2)
+Replaces: fence-agents (<< 4.7.1-1ubuntu2)
+Description: Common files used by the Fence Agents for Red Hat Cluster
+ Red Hat Fence Agents is a collection of scripts to handle remote
+ power management for several devices.  They allow failed or
+ unreachable nodes to be forcibly restarted and removed from the
+ cluster.
+ .
+ This package provides common files used by the Fence Agents.
diff --git a/debian/curated-agents b/debian/curated-agents
new file mode 100644
index 0000000..dcba8c2
--- /dev/null
+++ b/debian/curated-agents
@@ -0,0 +1,11 @@
+fence_idrac
+fence_ilo3
+fence_ilo4
+fence_ilo5
+fence_imm
+fence_ipmilan
+fence_ipmilanplus
+fence_mpath
+fence_sbd
+fence_scsi
+fence_virsh
diff --git a/debian/extract-agents-description b/debian/extract-agents-description
new file mode 100755
index 0000000..3bb4e7e
--- /dev/null
+++ b/debian/extract-agents-description
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -x
+
+export LC_ALL=C
+
+agents=()
+curated_agents=()
+non_curated_agents=()
+
+for file in tests/data/metadata/*.xml; do
+  agent=$(sed -ne 's/<resource-agent name="\(.*\)" shortdesc="\(.*\)".*/\1: \2/p' "$file" | \
+          sed -e 's/\(I.O \)\?\(Fence\|Fencing\) agent for //')
+  agents+=("$agent")
+done
+
+for agent in "${agents[@]}"; do
+  # This agent was already skipped previously, not related to the split of the
+  # supported and unsupported fence-agents.
+  if grep -qFx "fence_amt_ws" <<< "$agent"; then
+    continue
+  fi
+
+  if grep -qFx $(cut -d: -f1 <<< "$agent") debian/curated-agents; then
+    curated_agents+=("$agent\${Newline}")
+  else
+    non_curated_agents+=("$agent\${Newline}")
+  fi
+done
+
+echo "supportedAgents=${curated_agents[*]}" >> debian/fence-agents-base.substvars
+echo "agents=${non_curated_agents[*]}" >> debian/fence-agents-extra.substvars
diff --git a/debian/fence-agents.docs b/debian/fence-agents-common.docs
similarity index 100%
rename from debian/fence-agents.docs
rename to debian/fence-agents-common.docs
diff --git a/debian/fence-agents.install b/debian/fence-agents.install
deleted file mode 100644
index 2d43a71..0000000
--- a/debian/fence-agents.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/libexec/fence-agents/fence_kdump_send
-usr/sbin/fence*
-usr/share/cluster/fence*
-usr/share/cluster/relaxng*
-usr/share/doc
-usr/share/fence*
-usr/share/man/man8/fence*
-usr/share/pkgconfig/fence-agents.pc
diff --git a/debian/fence-virt.install b/debian/fence-virt.install
index 7bbfe98..205ac34 100644
--- a/debian/fence-virt.install
+++ b/debian/fence-virt.install
@@ -1,4 +1,4 @@
-usr/sbin/fence_virt
-usr/sbin/fence_xvm
-usr/share/man/man8/fence_virt.8
-usr/share/man/man8/fence_xvm.8
+debian/fence-agents-extra/usr/sbin/fence_virt             usr/sbin/
+debian/fence-agents-extra/usr/sbin/fence_xvm              usr/sbin/
+debian/fence-agents-extra/usr/share/man/man8/fence_virt.8 usr/share/man/man8/
+debian/fence-agents-extra/usr/share/man/man8/fence_xvm.8  usr/share/man/man8/
diff --git a/debian/fence-virtd.install b/debian/fence-virtd.install
index 3f9f6f1..bf20135 100644
--- a/debian/fence-virtd.install
+++ b/debian/fence-virtd.install
@@ -1,5 +1,5 @@
-etc/fence_virt.conf
-usr/lib/*/fence-virt/*.so
-usr/sbin/fence_virtd
-usr/share/man/man5/fence_virt.conf.5
-usr/share/man/man8/fence_virtd.8
+debian/fence-agents-extra/etc/fence_virt.conf                  etc/
+debian/fence-agents-extra/usr/lib/*/fence-virt/*.so            usr/lib/${DEB_HOST_MULTIARCH}/fence-virt/
+debian/fence-agents-extra/usr/sbin/fence_virtd                 usr/sbin/
+debian/fence-agents-extra/usr/share/man/man5/fence_virt.conf.5 usr/share/man/man5/
+debian/fence-agents-extra/usr/share/man/man8/fence_virtd.8     usr/share/man/man8/
diff --git a/debian/install-curated-agents b/debian/install-curated-agents
new file mode 100755
index 0000000..e0298e2
--- /dev/null
+++ b/debian/install-curated-agents
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -x
+
+readonly FENCE_AGENTS_BASE="debian/fence-agents-base"
+readonly FENCE_AGENTS_EXTRA="debian/fence-agents-extra"
+
+mkdir -p "$FENCE_AGENTS_BASE"/usr/sbin \
+         "$FENCE_AGENTS_BASE"/usr/share/man/man8
+
+for agent in $(cat debian/curated-agents); do
+  mv "$FENCE_AGENTS_EXTRA"/usr/sbin/$agent \
+     "$FENCE_AGENTS_BASE"/usr/sbin/
+  mv "$FENCE_AGENTS_EXTRA"/usr/share/man/man8/$agent.8 \
+     "$FENCE_AGENTS_BASE"/usr/share/man/man8/
+done
diff --git a/debian/rules b/debian/rules
index 4bb0153..dde48ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
 
+FENCE_AGENTS_EXTRA_DIR="$(CURDIR)/debian/fence-agents-extra"
+FENCE_AGENTS_COMMON_DIR="$(CURDIR)/debian/fence-agents-common"
+
 %:
 	dh $@ --with python3
 
@@ -27,32 +30,52 @@ override_dh_auto_build:
 	LC_ALL=C dh_auto_build
 
 override_dh_auto_install:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(FENCE_AGENTS_EXTRA_DIR)
 
 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
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/doc/fence-agents/COPY*
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/doc/fence-agents/README.licence
+	rmdir $(FENCE_AGENTS_EXTRA_DIR)/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
-	rm -v debian/tmp/usr/share/man/man8/fence_zvm.8
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/sbin/fence_zvm
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/man/man8/fence_zvm.8
 endif
+
+	# Move the curated agents to the right binary package
+	debian/install-curated-agents
+
+	# Move the common python code to a separate binary package to be used
+	# by -base and -extra.
+	mkdir -vp $(FENCE_AGENTS_COMMON_DIR)/usr/share/fence
+	mv -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/fence/*.py \
+	      $(FENCE_AGENTS_COMMON_DIR)/usr/share/fence/
+
+	# Move var directory to fence-agents-common
+	mv -v $(FENCE_AGENTS_EXTRA_DIR)/var \
+	      $(FENCE_AGENTS_COMMON_DIR)
+	# /var/run/... is temporary and recreated on demand by the agents
+	rm -vrf $(FENCE_AGENTS_COMMON_DIR)/var/run
+
+	# Move pkgconfig directory to fence-agents-common
+	mv -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/pkgconfig \
+	      $(FENCE_AGENTS_COMMON_DIR)/usr/share/
+
 	dh_install
 	# 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_virt) continue;; esac; \
+	for agent in $(CURDIR)/debian/fence-agents*/usr/sbin/*; do \
+		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; \
+		PYTHONPATH=$(FENCE_AGENTS_COMMON_DIR)/usr/share/fence $$agent --help >/dev/null || exit; \
 	done
 	# fence_virt is in a separate package
-	rm -v debian/fence-agents/usr/sbin/fence_virt
-	rm -v debian/fence-agents/usr/sbin/fence_virtd
-	rm -v debian/fence-agents/usr/sbin/fence_xvm
-	rm -v debian/fence-agents/usr/share/man/man8/fence_virt.8
-	rm -v debian/fence-agents/usr/share/man/man8/fence_virtd.8
-	rm -v debian/fence-agents/usr/share/man/man8/fence_xvm.8
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/sbin/fence_virt
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/sbin/fence_virtd
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/sbin/fence_xvm
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/man/man8/fence_virt.8
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/man/man8/fence_virtd.8
+	rm -v $(FENCE_AGENTS_EXTRA_DIR)/usr/share/man/man8/fence_xvm.8
 
 # tests are slow and require network access so moved to debian/tests/{delay,metadata}
 override_dh_auto_test:
@@ -70,17 +93,10 @@ override_dh_installinit:
 	dh_installinit -pfence-virtd --name=fence_virtd
 
 override_dh_missing:
-	rm debian/tmp/usr/lib/*/fence-virt/*.*a
+	rm $(FENCE_AGENTS_EXTRA_DIR)/usr/lib/*/fence-virt/*.*a
 	dh_missing --fail-missing
 
 override_dh_gencontrol:
 	# extract agent descriptions for use in debian/control
-	export LC_ALL=C; \
-	( echo -n "agents="; \
-	  sed -ne 's/<resource-agent name="\(.*\)" shortdesc="\(.*\)".*/\1: \2/p' tests/data/metadata/*.xml | \
-	  sed -e 's/\(I.O \)\?\(Fence\|Fencing\) agent for //' | \
-	  grep -v 'fence_amt_ws:\|fence_virt:' | \
-	  while read line; do echo -n " $$line\$${Newline}"; done ; \
-	  echo ; \
-	) >> debian/fence-agents.substvars
+	debian/extract-agents-description
 	dh_gencontrol
diff --git a/debian/tests/delay b/debian/tests/delay
index ad0af03..1ad534f 100755
--- a/debian/tests/delay
+++ b/debian/tests/delay
@@ -6,6 +6,12 @@ DEFAULT_ARGS='delay=10\n login=test\n passwd=test\n ipaddr=127.0.0.1\n port=1\n 
 OUTPUT=$AUTOPKGTEST_TMP/delay
 mkdir -p $OUTPUT
 
+if [ "$(dpkg --print-architecture)" = "ppc64el" ]; then
+    MIN_DELAY=500
+else
+    MIN_DELAY=1000
+fi
+
 for agent in /usr/sbin/fence_*; do
   [ "$agent" = "/usr/sbin/fence_ack_manual" ] && continue
   [ "$agent" = "/usr/sbin/fence_kdump" ] && continue
@@ -18,7 +24,7 @@ for agent in /usr/sbin/fence_*; do
 
   (
     TIME=$(/usr/bin/time -p sh -c "printf '$ARGS' | $agent " 2>&1 | awk -F"[. ]" -vOFS= '/real/ {print $2,$3}')
-    if [ "$TIME" -lt 1000 ]; then
+    if [ "$TIME" -lt "$MIN_DELAY" ]; then
       echo "$agent delay too low: $TIME" | tee $LOG
     else
       echo "$agent delay ok: $TIME" | tee $LOG