This still seems a Good Idea(tm) to start the process of moving to
/usr/libexec, but I do update patches if I discover issues.

Note, for the shorter term it makes sense to leave things in /usr/lib.
Until a few revisions pass with both /usr/lib and /usr/libexec copies,
xen-utils-common must keep using /usr/lib.  Issue is once
xen-utils-common uses /usr/libexec, older installations break.  Best to
keep compatibility with old builds for a while.


-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         ehem+sig...@m5p.com  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445


>From b7477e7fab01b48b663d3e89e4f4c7bd352c8b7e Mon Sep 17 00:00:00 2001
From: Elliott Mitchell <ehem+deb...@m5p.com>
Date: Sat, 26 Feb 2022 17:15:46 -0800
Subject: [PATCH] debian: Initial phase of moving xen-utils-* to libexec,
 future compat

At some future point the executables will be moved to /usr/libexec.
Ensure current versions of the package will be compatible with future
xen-utils-common packages which expect the files in /usr/libexec.

Signed-off-by: Elliott Mitchell <ehem+deb...@m5p.com>
---
 debian/rules                      | 4 ++++
 debian/xen-utils-V.install.vsn-in | 3 +++
 debian/xen-utils-common.install   | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/debian/rules b/debian/rules
index ba2567b4de..095ad07c51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -298,6 +298,10 @@ xenstore_rm = $(addprefix debian/xen-utils-common/,		\
 override_dh_install:
 	debian/shuffle-binaries $(upstream_version)
 	:
+	mkdir $(t)/usr/libexec
+	ln -s /usr/lib/xen-$(upstream_version)/bin $(t)/usr/libexec/xen-$(upstream_version)
+	ln -s /usr/lib/xen-common/bin $(t)/usr/libexec/xen
+	:
 	debian/shuffle-boot-files $(upstream_version) $(flavour)
 	:
 	dh_install $(dh_install_excludes)
diff --git a/debian/xen-utils-V.install.vsn-in b/debian/xen-utils-V.install.vsn-in
index da04b59d42..66dc5cd190 100644
--- a/debian/xen-utils-V.install.vsn-in
+++ b/debian/xen-utils-V.install.vsn-in
@@ -1,3 +1,6 @@
+# initial phase of moving to libexec, future compatibility
+usr/libexec/xen-@version@
+
 usr/lib/xen-@version@/bin
 usr/lib/xen-@version@/lib/python
 
diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install
index 620825ad18..121d45d8a0 100755
--- a/debian/xen-utils-common.install
+++ b/debian/xen-utils-common.install
@@ -29,3 +29,6 @@ usr/share/man
 
 ../scripts/xen-toolstack-wrapper	usr/lib/xen-common/bin
 ../scripts/xen-toolstack		usr/lib/xen-common/bin
+
+# initial phase of moving to libexec, future compatibility
+usr/libexec/xen
-- 
2.30.2

Reply via email to