Skip to content

Commit 5fc2a24

Browse files
committed
CP-310443: Drop legacy mpathutil tool
This is undocumented and since the restructuring of the installation no longer functions. Signed-off-by: Mark Syms <mark.syms@citrix.com>
1 parent b9a4776 commit 5fc2a24

File tree

3 files changed

+0
-75
lines changed

3 files changed

+0
-75
lines changed

Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ SM_COMPAT_PY_FILES = $(foreach LIB, $(SM_COMPAT_LIBS), compat-libs/$(LIB).py) $(
216216
SM_XTRA_PY_FILES :=
217217
SM_XTRA_PY_FILES += $(foreach LIB, $(SM_LIBEXEC_PY_CMDS), utils/$(LIB))
218218
SM_XTRA_PY_FILES += $(foreach LIB, $(SM_LIBEXEC_PY_XTRAS), utils/$(LIB).py)
219-
SM_XTRA_PY_FILES += utils/mpathutil.py
220219
SM_XTRA_PY_FILES += utils/blktap2
221220
SM_XTRA_PY_FILES += utils/tapdisk-cache-stats
222221
SM_XTRA_PY_FILES += utils/keymanagerutil
@@ -364,10 +363,6 @@ install: precheck
364363
for s in $(SM_UDEV_SCRIPTS); do \
365364
install -m 755 scripts/$$s $(SM_STAGING)$(UDEV_SCRIPTS_DIR)/$$s; \
366365
done
367-
# Install mpathutil and compatibility symlinks
368-
install -D -m 755 utils/mpathutil.py $(SM_STAGING)$(BIN_DEST)/mpathutil
369-
ln -sf $(BIN_DEST)mpathutil $(SM_STAGING)$(OPT_SM_DEST)/mpathutil.py
370-
ln -sf $(BIN_DEST)mpathutil $(SM_STAGING)/sbin/mpathutil
371366
# Install blktap2 and compatibility symlinks
372367
install -D -m 755 utils/blktap2 $(SM_STAGING)$(BIN_DEST)/blktap2
373368
ln -sf $(BIN_DEST)blktap2 $(SM_STAGING)$(OPT_BIN_DEST)/blktap2

mk/sm.spec.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ tests/run_python_unittests.sh
114114
%{_sysconfdir}/xapi.d/plugins/intellicache-clean
115115
%{_sysconfdir}/xapi.d/plugins/trim
116116
%{_sysconfdir}/xapi.d/xapi-pre-shutdown/*
117-
%{_bindir}/mpathutil
118117
%{_bindir}/blktap2
119118
%{_bindir}/tapdisk-cache-stats
120119
%{_unitdir}/make-dummy-sr.service
@@ -199,7 +198,6 @@ callers which expect to find python files in /opt/xensource
199198

200199

201200
%files -n python%{python3_pkgversion}-sm-compat
202-
/sbin/mpathutil
203201
/opt/xensource/sm
204202
/opt/xensource/bin/blktap2
205203
/opt/xensource/bin/tapdisk-cache-stats

utils/mpathutil.py

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)