hotplug-common: Strip arch-specific libdir from config file

Closes: #862236
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --git a/debian/rules b/debian/rules
index 6a4a5e19dc1345208e6d821d16c744d7cc7c2cfd..4d3ff89219f402c9feec8a61370af74eb2cf34c5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -229,6 +229,12 @@ override_dh_auto_install: $(TEMPLATED_FILES)
                armhf) ;; \
                *) mv $t/usr/lib64/efi/* $t/boot/. ;; \
        esac
+       :
+       @# This file contains an arch-specific path and we put it
+       @# in xen-utils-common, an arch-all package.  But the
+       @# path is only used to put the libdir on LD_LIBRARY_PATH
+       @# in the hotplug scripts.  We have a patch to drop that.
+       sed -i '/^libdir=/d' $t/etc/xen/scripts/hotplugpath.sh
 
 # libfsimage not only has an unstable ABI, but also a very poor name.
 # Our makefile patch puts it in a different directory and fixes up the