mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools: Install pv bootloaders in libexec rather than /usr/bin
pygrub and xenpvnetboot are meant to be run by tools, and not by the user, and thus should be in /usr/lib/xen/bin rather than /usr/bin. Because most config files will still have an absolute path pointing to /usr/bin/pygrub, make a symbolic link that we will deprecate. Signed-off-by: George Dunlap <george.dunlap@eu.ctirix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
George Dunlap committed
1 parent
965932f9fe
commit
10c88f1c18
2 files changed
+10
-3
No files matched your search
+6
-1
@@ -18,7 +18,7 @@ SUBDIRS-$(CONFIG_LOMOUNT) += lomount
|
||||
SUBDIRS-$(CONFIG_MINITERM) += miniterm
|
||||
SUBDIRS := $(SUBDIRS-y)
|
||||
|
||||
INSTALL_BIN-y := xencons xenpvnetboot
|
||||
INSTALL_BIN-y := xencons
|
||||
INSTALL_BIN-$(CONFIG_X86) += xen-detect
|
||||
INSTALL_BIN := $(INSTALL_BIN-y)
|
||||
|
||||
@@ -27,6 +27,9 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd
|
||||
INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool
|
||||
INSTALL_SBIN := $(INSTALL_SBIN-y)
|
||||
|
||||
INSTALL_PRIVBIN-y := xenpvnetboot
|
||||
INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y)
|
||||
|
||||
# Include configure output (config.h) to headers search path
|
||||
CFLAGS += -I$(XEN_ROOT)/tools
|
||||
|
||||
@@ -41,8 +44,10 @@ build: $(TARGETS)
|
||||
install: build
|
||||
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
|
||||
$(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
|
||||
$(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
|
||||
set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
@@ -11,9 +11,11 @@ build:
|
||||
.PHONY: install
|
||||
install: all
|
||||
CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
|
||||
$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force
|
||||
$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
|
||||
$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
|
||||
--install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
|
||||
$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
|
||||
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
|
||||
ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
||||