diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2013-07-31 16:15:49 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-20 15:33:37 +0100 |
commit | 9af42f3598ba6f4b38384fdd2038c30f7ec763b9 (patch) | |
tree | 3b03b3aa9bd8973ed75a84e1f34985f2f4125674 /tools | |
parent | d72e8bcf12eb0b9e0fcfbc48406b5c4cbf9a84ef (diff) | |
download | xen-9af42f3598ba6f4b38384fdd2038c30f7ec763b9.tar.gz xen-9af42f3598ba6f4b38384fdd2038c30f7ec763b9.tar.bz2 xen-9af42f3598ba6f4b38384fdd2038c30f7ec763b9.zip |
tools: move xm and xend under tools python
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Matt Wilson <msw@amazon.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/misc/Makefile | 2 | ||||
-rw-r--r-- | tools/python/Makefile | 4 | ||||
-rw-r--r-- | tools/python/xen/xend/xend (renamed from tools/misc/xend) | 0 | ||||
-rwxr-xr-x | tools/python/xen/xm/xm (renamed from tools/misc/xm) | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 520ef809b2..73b55ddc07 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,7 +22,7 @@ INSTALL_BIN-y := xencons xencov_split INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) -INSTALL_SBIN-y := xm xen-bugtool xen-python-path xend xenperf xsview xenpm xen-tmem-list-parse gtraceview \ +INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xsview xenpm xen-tmem-list-parse gtraceview \ gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool diff --git a/tools/python/Makefile b/tools/python/Makefile index 9be11225fa..8461d0fe4d 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -23,6 +23,10 @@ install: install-dtd CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force + $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) xen/xm/xm $(DESTDIR)$(SBINDIR)/xm + $(INSTALL_PYTHON_PROG) xen/xend/xend $(DESTDIR)$(SBINDIR)/xend + install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR)/xen diff --git a/tools/misc/xend b/tools/python/xen/xend/xend index 9ef021054c..9ef021054c 100644 --- a/tools/misc/xend +++ b/tools/python/xen/xend/xend diff --git a/tools/misc/xm b/tools/python/xen/xm/xm index f4fd200346..f4fd200346 100755 --- a/tools/misc/xm +++ b/tools/python/xen/xm/xm |