aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--tools/misc/sxp-pretty8
-rw-r--r--tools/misc/xen-bugtool3
-rw-r--r--tools/misc/xen-python-path31
-rw-r--r--tools/misc/xend8
-rwxr-xr-xtools/misc/xm3
-rw-r--r--tools/misc/xsview2
-rw-r--r--tools/pygrub/Makefile9
-rw-r--r--tools/pygrub/src/pygrub2
-rw-r--r--tools/python/Makefile8
-rw-r--r--tools/python/scripts/test_hvm_create.py1
-rw-r--r--tools/python/scripts/test_vm_create.py1
-rw-r--r--tools/python/scripts/xapi.py1
-rw-r--r--tools/security/Makefile10
-rw-r--r--tools/security/python/xensec_tools/acm_getlabel4
-rw-r--r--tools/security/xensec_gen.py4
-rwxr-xr-xtools/sv/index.psp1
-rw-r--r--tools/vnet/scripts/vn3
18 files changed, 11 insertions, 94 deletions
diff --git a/Makefile b/Makefile
index 131ab3d1a3..237c107ff0 100644
--- a/Makefile
+++ b/Makefile
@@ -188,11 +188,7 @@ help:
@echo ' clean-tboot - clean the tboot module if it exists'
@echo
@echo 'Environment:'
- @echo ' XEN_PYTHON_NATIVE_INSTALL=y'
- @echo ' - native python install or dist'
- @echo ' install into prefix/lib/python<VERSION>'
- @echo ' instead of <PREFIX>/lib/python'
- @echo ' true if set to non-empty value, false otherwise'
+ @echo ' [ this documentation is sadly not complete ]'
# Use this target with extreme care!
.PHONY: uninstall
diff --git a/tools/misc/sxp-pretty b/tools/misc/sxp-pretty
index 4b8eaed335..dd642b088e 100644
--- a/tools/misc/sxp-pretty
+++ b/tools/misc/sxp-pretty
@@ -23,14 +23,6 @@ import os.path
import pprint
import sys
-result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
- 'xen-python-path'))
-if result[0] != 0:
- print >>sys.stderr, result[1]
- sys.exit(1)
-
-sys.path.append(result[1])
-
import xen.xend.sxp as sxp
def main():
diff --git a/tools/misc/xen-bugtool b/tools/misc/xen-bugtool
index cf41c8c957..a3742b4787 100644
--- a/tools/misc/xen-bugtool
+++ b/tools/misc/xen-bugtool
@@ -6,9 +6,6 @@
import sys
-sys.path.append('/usr/lib/python')
-sys.path.append('/usr/lib64/python')
-
from xen.util import bugtool
diff --git a/tools/misc/xen-python-path b/tools/misc/xen-python-path
index 57774a332b..073abaef53 100644
--- a/tools/misc/xen-python-path
+++ b/tools/misc/xen-python-path
@@ -17,31 +17,8 @@
# Copyright (C) 2007 XenSource Inc.
#============================================================================
+# Nowadays we install xen in the standard python site-packages
+# directories. This script is still provided for the benefit of old
+# out-of-xen-tree callers. It is deprecated and will be removed.
-# Use the auxbin module in Xend to determine the correct Python path. We
-# take the first installed instance of auxbin that we find, and then run it
-# to determine the correct path, appending that to sys.path.
-
-AUXBIN = 'xen/util/auxbin.py'
-
-import os
-import os.path
-import sys
-
-usr = os.path.dirname(os.path.dirname(sys.argv[0]))
-list = [ os.path.join(usr,'lib64') ]
-list += [ os.path.join(usr,'lib') ]
-list += ['/usr/lib64', '/usr/lib']
-
-for l in list:
- for p in ['python%s' % sys.version[:3], 'python']:
- for k in ['', 'site-packages/']:
- d = os.path.join(l, p, k)
- if os.path.exists(os.path.join(d, AUXBIN)):
- sys.path.append(d)
- import xen.util.auxbin
- print os.path.join(xen.util.auxbin.libpath(), p)
- sys.exit(0)
-
-print >>sys.stderr, "Cannot find Xen Python modules."
-sys.exit(1)
+print '/dev/enoent/xen/python-path'
diff --git a/tools/misc/xend b/tools/misc/xend
index 2cbdf6175c..4dd550bbed 100644
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -33,14 +33,6 @@ import signal
import time
import commands
-xpp = os.path.join(os.path.dirname(sys.argv[0]), 'xen-python-path')
-if os.path.exists(xpp):
- result = commands.getstatusoutput(xpp)
- if result[0] != 0:
- print >>sys.stderr, result[1]
- sys.exit(1)
- sys.path.append(result[1])
-
from xen.xend.server import SrvDaemon
class CheckError(ValueError):
diff --git a/tools/misc/xm b/tools/misc/xm
index 80972ccef9..f4fd200346 100755
--- a/tools/misc/xm
+++ b/tools/misc/xm
@@ -2,9 +2,6 @@
# -*- mode: python; -*-
import sys
-# add fallback path for non-native python path installs if needed
-sys.path.append('/usr/lib/python')
-sys.path.append('/usr/lib64/python')
from xen.xm import main
main.main(sys.argv)
diff --git a/tools/misc/xsview b/tools/misc/xsview
index c6726554b7..f926fe4fc6 100644
--- a/tools/misc/xsview
+++ b/tools/misc/xsview
@@ -2,8 +2,6 @@
import sys
-sys.path.append('/usr/lib/python')
-sys.path.append('/usr/lib64/python')
from xen.xsview import main
main.main(sys.argv)
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 0e30db481c..0791012e2a 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -9,15 +9,10 @@ build:
CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
.PHONY: install
-ifndef XEN_PYTHON_NATIVE_INSTALL
install: all
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force
+ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install \
+ --prefix="$(PREFIX)" --root="$(DESTDIR)" --force
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-else
-install: all
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
- $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-endif
.PHONY: clean
clean:
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index e43dcc2d9a..095db5e72c 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -21,8 +21,6 @@ import platform
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
-sys.path = [ '/usr/lib/python', '/usr/lib64/python' ] + sys.path
-
import fsimage
import grub.GrubConf
import grub.LiloConf
diff --git a/tools/python/Makefile b/tools/python/Makefile
index 700640645b..cbc3973d02 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -54,13 +54,9 @@ refresh-po: $(POTFILE)
$(MSGFMT) -c -o $@ $<
.PHONY: install
-ifndef XEN_PYTHON_NATIVE_INSTALL
install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --home="$(PREFIX)" --prefix="" --force
-else
-install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
-endif
+ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install \
+ --prefix="$(PREFIX)" --root="$(DESTDIR)" --force
install-dtd: all
$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
diff --git a/tools/python/scripts/test_hvm_create.py b/tools/python/scripts/test_hvm_create.py
index 35abfe0396..50203635da 100644
--- a/tools/python/scripts/test_hvm_create.py
+++ b/tools/python/scripts/test_hvm_create.py
@@ -74,7 +74,6 @@ console_cfg = {
import sys
import time
-sys.path.append('/usr/lib/python')
from xapi import connect, execute
diff --git a/tools/python/scripts/test_vm_create.py b/tools/python/scripts/test_vm_create.py
index 6575f153ea..9ac8a6eee2 100644
--- a/tools/python/scripts/test_vm_create.py
+++ b/tools/python/scripts/test_vm_create.py
@@ -93,7 +93,6 @@ console_cfg = {
import sys
import time
-sys.path.append('/usr/lib/python')
from xapi import connect, execute
diff --git a/tools/python/scripts/xapi.py b/tools/python/scripts/xapi.py
index 1a07795212..9530f4a151 100644
--- a/tools/python/scripts/xapi.py
+++ b/tools/python/scripts/xapi.py
@@ -20,7 +20,6 @@ import sys
import time
import re
import os
-sys.path.append('/usr/lib/python')
from xen.util.xmlrpclib2 import ServerProxy
from optparse import *
diff --git a/tools/security/Makefile b/tools/security/Makefile
index 61062715a2..996e96599a 100644
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -40,9 +40,6 @@ ifeq ($(ACM_SECURITY),y)
all: build
.PHONY: install
-ifndef XEN_PYTHON_NATIVE_INSTALL
-install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
-endif
install: all $(ACM_CONFIG_FILE)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)$(SBINDIR)
@@ -63,11 +60,8 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
$(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
-ifndef XEN_PYTHON_NATIVE_INSTALL
- python python/setup.py install --install-lib="$(DESTDIR)$(LIBPATH)/python"
-else
- python python/setup.py install --root="$(DESTDIR)"
-endif
+ python python/setup.py install \
+ --prefix="$(PREFIX)" --root="$(DESTDIR)" --force
else
.PHONY: all
all:
diff --git a/tools/security/python/xensec_tools/acm_getlabel b/tools/security/python/xensec_tools/acm_getlabel
index 63137a9993..8d5fe22461 100644
--- a/tools/security/python/xensec_tools/acm_getlabel
+++ b/tools/security/python/xensec_tools/acm_getlabel
@@ -4,10 +4,6 @@ import sys
import traceback
import getopt
-# add fallback path for non-native python path installs if needed
-sys.path.insert(-1, '/usr/lib/python')
-sys.path.insert(-1, '/usr/lib64/python')
-
from xen.util.security import ACMError, err, get_ssid
# getopt.gnu_getopt is better, but only exists in Python 2.3+. Use
diff --git a/tools/security/xensec_gen.py b/tools/security/xensec_gen.py
index 8f65b4cf1a..d531777660 100644
--- a/tools/security/xensec_gen.py
+++ b/tools/security/xensec_gen.py
@@ -17,10 +17,6 @@
import sys
-# Add fallback path for non-native python path installs if needed
-sys.path.append( '/usr/lib/python' )
-sys.path.append( '/usr/lib64/python' )
-
from xen.xensec_gen import main
main.main( )
diff --git a/tools/sv/index.psp b/tools/sv/index.psp
index 192aff84fa..829d468db4 100755
--- a/tools/sv/index.psp
+++ b/tools/sv/index.psp
@@ -1,6 +1,5 @@
<%
import sys
-sys.path.append( "/usr/lib/python" )
debug = True and False
diff --git a/tools/vnet/scripts/vn b/tools/vnet/scripts/vn
index 8e8e224d4b..4a4281f6f1 100644
--- a/tools/vnet/scripts/vn
+++ b/tools/vnet/scripts/vn
@@ -27,9 +27,6 @@ import socket
import sys
from getopt import getopt, GetoptError
-sys.path.append('/usr/lib/python')
-sys.path.append('/usr/lib64/python')
-
from xen.xend import sxp
from xen.xend.PrettyPrint import prettyprint
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 10:07:08 +0000