| Message ID | 20200311175933.1362235-3-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix installation of python scripts | expand |
On Wed, Mar 11, 2020 at 05:59:33PM +0000, Anthony PERARD wrote: > Whenever python scripts are install, have the shebang be modified to use > whatever PYTHON_PATH is. This is useful for system where python isn't available, or > where the package build tools prevent unversioned shebang. > > INSTALL_PYTHON_PROG only looks for "#!/usr/bin/env python". > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Wei Liu <wl@xen.org>
diff --git a/tools/misc/xencov_split b/tools/misc/xencov_split index 1f20518b8637..5771f6cfc285 100755 --- a/tools/misc/xencov_split +++ b/tools/misc/xencov_split @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os, os.path as path, struct, errno from optparse import OptionParser diff --git a/tools/python/Makefile b/tools/python/Makefile index e99f78a5373a..8d22c0367657 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -20,8 +20,8 @@ install: setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ --root="$(DESTDIR)" --force - $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index e1712304d07d..3e150b065998 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -32,7 +32,7 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon + $(INSTALL_PYTHON_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon .PHONY: uninstall uninstall:
Whenever python scripts are install, have the shebang be modified to use whatever PYTHON_PATH is. This is useful for system where python isn't available, or where the package build tools prevent unversioned shebang. INSTALL_PYTHON_PROG only looks for "#!/usr/bin/env python". Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/misc/xencov_split | 2 +- tools/python/Makefile | 4 ++-- tools/xenmon/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)