From d0df59f6eaf46d6116724a31038cc174cdafd47a Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Tue, 4 Feb 2020 15:24:32 +0100 Subject: [PATCH] debian/: Follow fsimage -> xenfsimage renaming In the upstream code, the name of this library has been changed to make it more Xen-specific. Also filesystem paths have changed. Update accordingly. Signed-off-by: Hans van Kranenburg --- debian/libxenmiscV.install.vsn-in | 4 ++-- debian/rules | 8 ++++---- debian/xen-utils-V.lintian-overrides.vsn-in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/libxenmiscV.install.vsn-in b/debian/libxenmiscV.install.vsn-in index 8e6f4fb74b..05187346df 100644 --- a/debian/libxenmiscV.install.vsn-in +++ b/debian/libxenmiscV.install.vsn-in @@ -4,5 +4,5 @@ usr/lib/*/libxenlight.so.* usr/lib/*/libxenstat.so.* usr/lib/*/libxenvchan.so.* usr/lib/*/libxlutil.so.* -usr/lib/xen-@version@/lib/*/libfsimage* -usr/lib/xen-@version@/lib/*/fs +usr/lib/xen-@version@/lib/*/libxenfsimage* +usr/lib/xen-@version@/lib/*/xenfsimage diff --git a/debian/rules b/debian/rules index 23e74de211..b96017a7ba 100755 --- a/debian/rules +++ b/debian/rules @@ -232,10 +232,10 @@ override_dh_auto_install: $(TEMPLATED_FILES) @# 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 -# rpath; this rules code excludes the header files. -dh_install_excludes += -Xinclude/fsimage +# libxenfsimage has an unstable ABI. Our makefile patch puts it in a +# different directory and fixes up the rpath; this rules code excludes the +# header files. +dh_install_excludes += -Xinclude/xenfsimage # The upstream build produces these. dh_install_excludes += -X'*.pyc' diff --git a/debian/xen-utils-V.lintian-overrides.vsn-in b/debian/xen-utils-V.lintian-overrides.vsn-in index 610186a7c5..0e4a4246f8 100644 --- a/debian/xen-utils-V.lintian-overrides.vsn-in +++ b/debian/xen-utils-V.lintian-overrides.vsn-in @@ -8,6 +8,6 @@ binary-has-unneeded-section usr/lib/xen-4.11/boot/xen-shim .note binary-from-other-architecture usr/lib/debug/xen-syms-4.11-shim/xen-shim-syms # ^ this is a symbols file for the shim -binary-or-shlib-defines-rpath usr/lib/xen-4.11/lib/python/fsimage.so /usr/lib/xen-4.11/lib/x86_64-linux-gnu +binary-or-shlib-defines-rpath usr/lib/xen-4.11/lib/python/xenfsimage.so /usr/lib/xen-4.11/lib/x86_64-linux-gnu # ^ this module needs to load the libfsimage .so from within # the xen-utils private directory. less +/fsimage debian/rules -- 2.30.2