xen-project/xen
1
0 Fork 0
mirror of https://github.com/xen-project/xen.git synced 2026-10-28 02:01:24 +01:00
Code Issues Activity

Use configure --libexecdir=BASEDIR to set LIBEXEC

Browse Source 
The current usage of LIBEXEC is bogus. It describes the directory for
private xen executables. Other places create their own, similar
libexecdir path as $prefix/lib/xen/*.

Additional two other variables are used to describe similar paths:
PRIVATE_BINDIR and PRIVATE_PREFIX

The autoconf documentation refers to libexec as a directory for
executables and stuff which is called by other programs, not by the
user.

Adjust all places that want libexecdir as a target path. LIBEXEC refers
now to the base directory. Three convenience variables are used to refer
to paths to private binaries, libs and include files.

In the systemd files LIBEXEC_BIN is substituted, so this variable has to
be present in autoconf. All other variables are expanded in Paths.mk
because they are only used in Makefiles.

Most users of LIBEXEC are updated to use LIBEXEC_BIN because that is
what they want.

Users of PRIVATE_BINDIR are updated to use LIBEXEC_BIN because that is
what they want. PRIVATE_BINDIR and PRIVATE_PREFIX usage is removed by
this patch, in favour of LIBXEC_BIN and LIBEXEC

An internal libxl function was removed. A single helper to retrieve
LIBEXEC_BIN remains.

As suggested by the autoconf documentation, configure appends the
package name to LIBEXEC to make sure the provided directory really
refers to xen. This makes sure "make uninstall" preserves the real
libexecdir.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ ijc -- ran autogen.sh as requested, updated QEMU_TRADITIONAL_REVISION to
         pickup version which uses LIBEXEC_BIN ]
This commit is contained in:
Olaf Hering authored and Ian Campbell committed 2014-10-06 16:59:56 +01:00
1 parent c66aa6c145
commit 2c96ecb1a4
32 files changed
+98 -120
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Config.mk
+4 -4
View File
@@ -162,7 +162,7 @@ define move-if-changed
if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi
endef
BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBDIR SHAREDIR PRIVATE_BINDIR \
BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \
XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
XEN_RUN_DIR XEN_PAGING_DIR
@@ -262,9 +262,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
ETHERBOOT_NICS ?= rtl8139 8086100e
QEMU_TRADITIONAL_REVISION ?= 58fac0693d8ad591add917e939011fe069720b0c
# Fri Aug 1 16:32:18 2014 +0100
# qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include
QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22
# Mon Oct 6 16:24:46 2014 +0100
# qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC)
# Specify which qemu-dm to use. This may be `ioemu' to use the old
# Mercurial in-tree version, or a local directory, or a git URL.
config/Paths.mk.in
+4 -4
View File
@@ -31,7 +31,10 @@ sysconfdir := @sysconfdir@
SBINDIR := $(sbindir)
BINDIR := $(bindir)
LIBEXEC := @LIBEXEC@
LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME)
LIBEXEC_BIN := @LIBEXEC_BIN@
LIBEXEC_LIB := $(LIBEXEC)/lib
LIBEXEC_INC := $(LIBEXEC)/include
INCLUDEDIR := $(includedir)
SHAREDIR := @SHAREDIR@
@@ -50,9 +53,6 @@ INITD_DIR := @INITD_DIR@
XEN_LOCK_DIR := @XEN_LOCK_DIR@
XEN_PAGING_DIR := @XEN_PAGING_DIR@
PRIVATE_PREFIX := @PRIVATE_PREFIX@
PRIVATE_BINDIR := @PRIVATE_BINDIR@
XENFIRMWAREDIR := @XENFIRMWAREDIR@
XEN_CONFIG_DIR := @XEN_CONFIG_DIR@
configure
Vendored
+11 -17
View File
@@ -601,13 +601,11 @@ XEN_CONFIG_DIR
INITD_DIR
CONFIG_DIR
XENFIRMWAREDIR
PRIVATE_BINDIR
PRIVATE_PREFIX
SHAREDIR
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
LIBEXEC
LIBEXEC_BIN
host_os
host_vendor
host_cpu
@@ -1897,10 +1895,16 @@ else
fi
case "$host_os" in
*netbsd*) LIBEXEC=$prefix/libexec ;;
*) LIBEXEC=$prefix/lib/xen/bin ;;
esac
if test "$libexecdir" = '${exec_prefix}/libexec' ; then
case "$host_os" in
*netbsd*) ;;
*)
libexecdir='${exec_prefix}/lib'
;;
esac
fi
libexecdir=`eval echo $libexecdir`
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
XEN_RUN_DIR=/var/run/xen
@@ -1915,16 +1919,6 @@ XEN_LIB_STORED=/var/lib/xenstored
SHAREDIR=$prefix/share
PRIVATE_PREFIX=`eval echo $libdir`
case "$host_os" in
*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
esac
XENFIRMWAREDIR=$prefix/lib/xen/boot
m4/paths.m4
+14 -17
View File
@@ -43,13 +43,20 @@ AC_ARG_WITH([initddir],
;;
esac])
dnl XXX: this should be changed to use the passed $libexec
dnl but can be done as a second step
case "$host_os" in
*netbsd*) LIBEXEC=$prefix/libexec ;;
*) LIBEXEC=$prefix/lib/xen/bin ;;
esac
AC_SUBST(LIBEXEC)
if test "$libexecdir" = '${exec_prefix}/libexec' ; then
case "$host_os" in
*netbsd*) ;;
*)
libexecdir='${exec_prefix}/lib'
;;
esac
fi
dnl expand exec_prefix or it will endup in substituted variables
libexecdir=`eval echo $libexecdir`
dnl autoconf doc suggest to use a "package name" subdir
dnl This variable will be substituted in various .in files
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
AC_SUBST(LIBEXEC_BIN)
XEN_RUN_DIR=/var/run/xen
AC_SUBST(XEN_RUN_DIR)
@@ -63,16 +70,6 @@ AC_SUBST(XEN_LIB_STORED)
SHAREDIR=$prefix/share
AC_SUBST(SHAREDIR)
PRIVATE_PREFIX=`eval echo $libdir`
AC_SUBST(PRIVATE_PREFIX)
case "$host_os" in
*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
esac
AC_SUBST(PRIVATE_BINDIR)
XENFIRMWAREDIR=$prefix/lib/xen/boot
AC_SUBST(XENFIRMWAREDIR)
stubdom/Makefile
+3 -3
View File
@@ -462,9 +462,9 @@ install-readme:
$(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom
install-ioemu: ioemu-stubdom
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
$(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)"
$(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)"
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
tools/Makefile
+5 -6
View File
@@ -94,8 +94,7 @@ uninstall:
rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
rm -rf $(D)$(LIBDIR)/xen/
rm -rf $(D)$(LIBEXEC)/xen*
rm -rf $(D)$(LIBEXEC)
rm -rf $(D)$(SBINDIR)/setmask
rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm
rm -rf $(D)$(SHAREDIR)/doc/xen
@@ -196,9 +195,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
cd qemu-xen-dir; \
$$source/configure --enable-xen --target-list=i386-softmmu \
$(QEMU_XEN_ENABLE_DEBUG) \
--prefix=$(PREFIX)/lib/xen \
--libdir=$(PREFIX)/lib/xen/lib \
--includedir=$(PREFIX)/lib/xen/include \
--prefix=$(LIBEXEC) \
--libdir=$(LIBEXEC_LIB) \
--includedir=$(LIBEXEC_INC) \
--source-path=$$source \
--extra-cflags="-I$(XEN_ROOT)/tools/include \
-I$(XEN_ROOT)/tools/libxc/include \
@@ -208,7 +207,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
--extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
-L$(XEN_ROOT)/tools/xenstore \
-Wl,-rpath=$(PREFIX)/lib/xen/lib" \
--bindir=$(LIBEXEC) \
--bindir=$(LIBEXEC_BIN) \
--datadir=$(SHAREDIR)/qemu-xen \
--localstatedir=/var \
--disable-kvm \
tools/configure
Vendored
+11 -17
View File
@@ -714,13 +714,11 @@ XEN_CONFIG_DIR
INITD_DIR
CONFIG_DIR
XENFIRMWAREDIR
PRIVATE_BINDIR
PRIVATE_PREFIX
SHAREDIR
XEN_LIB_STORED
XEN_LOG_DIR
XEN_RUN_DIR
LIBEXEC
LIBEXEC_BIN
FILE_OFFSET_BITS
OBJEXT
EXEEXT
@@ -3732,10 +3730,16 @@ else
fi
case "$host_os" in
*netbsd*) LIBEXEC=$prefix/libexec ;;
*) LIBEXEC=$prefix/lib/xen/bin ;;
esac
if test "$libexecdir" = '${exec_prefix}/libexec' ; then
case "$host_os" in
*netbsd*) ;;
*)
libexecdir='${exec_prefix}/lib'
;;
esac
fi
libexecdir=`eval echo $libexecdir`
LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
XEN_RUN_DIR=/var/run/xen
@@ -3750,16 +3754,6 @@ XEN_LIB_STORED=/var/lib/xenstored
SHAREDIR=$prefix/share
PRIVATE_PREFIX=`eval echo $libdir`
case "$host_os" in
*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
esac
XENFIRMWAREDIR=$prefix/lib/xen/boot
tools/console/Makefile
+2 -2
View File
@@ -32,7 +32,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
install: $(BIN)
$(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN)
-include $(DEPS)
tools/hotplug/FreeBSD/rc.d/xencommons.in
+1 -1
View File
@@ -65,7 +65,7 @@ xen_startcmd()
printf "\n"
printf "Setting domain 0 name, domid and JSON config...\n"
${PRIVATE_BINDIR}/xen-init-dom0
${LIBEXEC_BIN}/xen-init-dom0
}
xen_stop()
tools/hotplug/FreeBSD/vif-bridge
+1 -1
View File
@@ -13,7 +13,7 @@
DIR=$(dirname "$0")
. "${DIR}/hotplugpath.sh"
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/bin:/usr/bin:/sbin:/usr/sbin
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin
export PATH
path=$1
tools/hotplug/Linux/Makefile
+2 -2
View File
@@ -56,8 +56,8 @@ install: all install-initd install-scripts install-udev subdirs-install
install-initd: all
[ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
[ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
[ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
$(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC)
[ -d $(DESTDIR)$(LIBEXEC_BIN) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
$(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
$(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+1 -1
View File
@@ -39,4 +39,4 @@
#XENBACKENDD_DEBUG=[yes|on|1]
# qemu path
#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386
#QEMU_XEN=@LIBEXEC_BIN@/qemu-system-i386
tools/hotplug/Linux/init.d/xencommons.in.in
+2 -2
View File
@@ -92,14 +92,14 @@ do_start () {
fi
echo Setting domain 0 name, domid and JSON config...
${PRIVATE_BINDIR}/xen-init-dom0
${LIBEXEC_BIN}/xen-init-dom0
fi
echo Starting xenconsoled...
test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
echo Starting QEMU as disk backend for dom0
test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386"
test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386"
$QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \
-monitor /dev/null -serial /dev/null -parallel /dev/null \
-pidfile $QEMU_PIDFILE
tools/hotplug/Linux/init.d/xendomains.in
+6 -6
View File
@@ -20,7 +20,7 @@
# Short-Description: Wrapper to start/stop secondary xen domains
# Description: Wrapper for starting / stopping domains automatically
# when domain 0 boots / shuts down on systems using init.
# The $LIBEXEC/xendomains helper is shared between init and
# The $LIBEXEC_BIN/xendomains helper is shared between init and
# systemd systems.
### END INIT INFO
@@ -28,19 +28,19 @@
case "$1" in
start)
$LIBEXEC/xendomains start
$LIBEXEC_BIN/xendomains start
;;
stop)
$LIBEXEC/xendomains stop
$LIBEXEC_BIN/xendomains stop
;;
restart)
$LIBEXEC/xendomains restart
$LIBEXEC_BIN/xendomains restart
;;
reload)
$LIBEXEC/xendomains reload
$LIBEXEC_BIN/xendomains reload
;;
status)
$LIBEXEC/xendomains status
$LIBEXEC_BIN/xendomains status
;;
*)
echo "Usage: $0 {start|stop|restart|reload|status}"
tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
+1 -1
View File
@@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/xenstored
PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid
ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
ExecStartPre=/bin/mkdir -p /var/run/xen
ExecStart=@LIBEXEC@/qemu-system-i386 -xen-domid 0 \
ExecStart=@LIBEXEC_BIN@/qemu-system-i386 -xen-domid 0 \
-xen-attach -name dom0 -nographic -M xenpv -daemonize \
-monitor /dev/null -serial /dev/null -parallel /dev/null \
-pidfile @XEN_RUN_DIR@/qemu-dom0.pid
tools/hotplug/Linux/systemd/xendomains.service.in
+3 -3
View File
@@ -8,9 +8,9 @@ ConditionVirtualization=xen
Type=oneshot
RemainAfterExit=true
ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
ExecStart=-@LIBEXEC@/xendomains start
ExecStop=@LIBEXEC@/xendomains stop
ExecReload=@LIBEXEC@/xendomains restart
ExecStart=-@LIBEXEC_BIN@/xendomains start
ExecStop=@LIBEXEC_BIN@/xendomains stop
ExecReload=@LIBEXEC_BIN@/xendomains restart
[Install]
WantedBy=multi-user.target
tools/hotplug/Linux/xen-hotplug-common.sh.in
+1 -1
View File
@@ -30,7 +30,7 @@ dir=$(dirname "$0")
exec 2>>/var/log/xen/xen-hotplug.log
export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH"
export LANG="POSIX"
unset $(set | grep ^LC_ | cut -d= -f1)
tools/hotplug/NetBSD/block
+1 -1
View File
@@ -7,7 +7,7 @@
DIR=$(dirname "$0")
. "${DIR}/hotplugpath.sh"
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/bin:/usr/bin:/sbin:/usr/sbin
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin
export PATH
error() {
tools/hotplug/NetBSD/rc.d/xencommons
+1 -1
View File
@@ -69,7 +69,7 @@ xen_startcmd()
printf "\n"
printf "Setting domain 0 name, domid and JSON config...\n"
${PRIVATE_BINDIR}/xen-init-dom0
${LIBEXEC_BIN}/xen-init-dom0
}
xen_stop()
tools/hotplug/NetBSD/vif-bridge
+1 -1
View File
@@ -7,7 +7,7 @@
DIR=$(dirname "$0")
. "${DIR}/hotplugpath.sh"
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/bin:/usr/bin:/sbin:/usr/sbin
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin
export PATH
xpath=$1
tools/hotplug/NetBSD/vif-ip
+1 -1
View File
@@ -7,7 +7,7 @@
DIR=$(dirname "$0")
. "${DIR}/hotplugpath.sh"
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC}:${PRIVATE_BINDIR}:/bin:/usr/bin:/sbin:/usr/sbin
PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin
export PATH
xpath=$1
tools/libxl/Makefile
+3 -3
View File
@@ -254,10 +254,10 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
$(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
$(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
$(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
tools/libxl/libxl_dm.c
+2 -2
View File
@@ -38,7 +38,7 @@ static const char *qemu_xen_path(libxl__gc *gc)
#ifdef QEMU_XEN_PATH
return QEMU_XEN_PATH;
#else
return libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path());
return libxl__abs_path(gc, "qemu-system-i386", libxl__private_bindir_path());
#endif
}
@@ -73,7 +73,7 @@ const char *libxl__domain_device_model(libxl__gc *gc,
} else {
switch (info->device_model_version) {
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
dm = libxl__abs_path(gc, "qemu-dm", libxl__libexec_path());
dm = libxl__abs_path(gc, "qemu-dm", libxl__private_bindir_path());
break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
dm = qemu_xen_path(gc);
tools/libxl/libxl_internal.h
-1
View File
@@ -2070,7 +2070,6 @@ _hidden int libxl__carefd_close(libxl__carefd*);
_hidden int libxl__carefd_fd(const libxl__carefd*);
/* common paths */
_hidden const char *libxl__libexec_path(void);
_hidden const char *libxl__private_bindir_path(void);
_hidden const char *libxl__xenfirmwaredir_path(void);
_hidden const char *libxl__xen_config_dir_path(void);
tools/libxl/libxl_paths.c
+1 -6
View File
@@ -15,14 +15,9 @@
#include "libxl_osdeps.h" /* must come before any other headers */
#include "libxl_internal.h"
const char *libxl__libexec_path(void)
{
return LIBEXEC;
}
const char *libxl__private_bindir_path(void)
{
return PRIVATE_BINDIR;
return LIBEXEC_BIN;
}
const char *libxl__xenfirmwaredir_path(void)
tools/libxl/libxl_save_callout.c
+1 -1
View File
@@ -174,7 +174,7 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs,
shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper"
" stdout pipe", domid);
*arg++ = getenv("LIBXL_SAVE_HELPER") ?: PRIVATE_BINDIR "/" "libxl-save-helper";
*arg++ = getenv("LIBXL_SAVE_HELPER") ?: LIBEXEC_BIN "/" "libxl-save-helper";
*arg++ = mode_arg;
const char **stream_fd_arg = arg++;
for (i=0; i<num_argnums; i++)
tools/misc/Makefile
+2 -2
View File
@@ -45,10 +45,10 @@ build: $(TARGETS)
install: build
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
$(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
$(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN)
set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
.PHONY: clean
tools/pygrub/Makefile
+4 -4
View File
@@ -12,11 +12,11 @@ build:
install: all
CC="$(CC)" CFLAGS="$(CFLAGS) $(APPEND_LDFLAGS)" $(PYTHON) setup.py install \
$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
--install-scripts=$(PRIVATE_BINDIR) --force
set -e; if [ $(BINDIR) != $(PRIVATE_BINDIR) -a \
--install-scripts=$(LIBEXEC_BIN) --force
set -e; if [ $(BINDIR) != $(LIBEXEC_BIN) -a \
"`readlink -f $(DESTDIR)/$(BINDIR)`" != \
"`readlink -f $(PRIVATE_BINDIR)`" ]; then \
ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
"`readlink -f $(LIBEXEC_BIN)`" ]; then \
ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(BINDIR); \
fi
.PHONY: clean
tools/vtpmmgr/Makefile
+3 -3
View File
@@ -5,9 +5,9 @@ all:
@true
install:
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_DATA) calc.pl "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_DATA) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC)"
$(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
$(INSTALL_DATA) calc.pl "$(DESTDIR)$(LIBEXEC_BIN)"
$(INSTALL_DATA) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC_BIN)"
clean:
@true
tools/xcutils/Makefile
+2 -2
View File
@@ -33,8 +33,8 @@ lsevtchn: lsevtchn.o
.PHONY: install
install: build
$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(LIBEXEC_BIN)
.PHONY: clean
tools/xenpaging/Makefile
+2 -2
View File
@@ -25,8 +25,8 @@ xenpaging: $(OBJS)
install: all
$(INSTALL_DIR) -m 0700 $(DESTDIR)$(XEN_PAGING_DIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
$(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC_BIN)
clean:
rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
tools/xentrace/Makefile
+2 -2
View File
@@ -21,12 +21,12 @@ build: $(BIN) $(LIBBIN)
.PHONY: install
install: build
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
$(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR)
$(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.