summaryrefslogtreecommitdiff
path: root/config/Paths.mk.in
Commit message (Collapse)AuthorAgeFilesLines
* tools/xenstore: remove XEN_LIB_STORED and XENSTORED_ROOTDIRJuergen Gross2022-11-021-1/+0
| | | | | | | | | | | | | | | | | XEN_LIB_STORED is serving no real purpose, as it is a mount point for a tmpfs, so it can be replaced easily by XEN_RUN_STORED. XENSTORED_ROOTDIR is basically unused already, there is just a single reference in xs_daemon_rootdir() with a fallback to XEN_LIB_STORED, and a .gdbinit file setting it. Remove the .gdbinit file, as it is not known having been used since ages, and make xs_daemon_rootdir() an alias of xs_daemon_rundir(). Reported-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> Release-acked-by: Henry Wang <Henry.Wang@arm.com>
* docs etc.: https: Fix references to wiki.xen[project].orgIan Jackson2020-03-301-1/+1
| | | | | | | | Change the url scheme to https. This is all in-tree references to the Xen wiki. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Reviewed-by: Julien Grall <jgrall@amazon.com>
* install pkgconfig files into libdirOlaf Hering2019-05-131-1/+1
| | | | | | | | | | | | | Most pkgconfig files contain a Libs: variable, which is either /usr/lib or /usr/lib64. If a 32bit and a 64bit variant of xen libraries is installed, the last one wins. As a result compiling for the other bitsize will fail. Instead of sharedir use libdir as install target. This matches both the documentation and the expected result. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Wei Liu <wei.liu2@citrix.com>
* tools: set DEBUG_DIR from configureRoger Pau Monne2018-04-011-0/+1
| | | | | | | | Allow the path to be set from a configure command line option. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> [ wei: run autogen.sh ]
* tools/configure: fix pkg-config install path for FreeBSDRoger Pau Monne2016-10-261-0/+2
| | | | | | | | | | | | | | | | | | pkg-config from FreeBSD ports doesn't have ${prefix}/share/pkgconfig in the default search path, fix this by having a PKG_INSTALLDIR variable that can be changed on a per-OS basis. It would be best to use PKG_INSTALLDIR as defined by the pkg.m4 macro, but sadly this also reports a wrong value on FreeBSD (${libdir}/pkgconfig, which expands to /usr/local/lib/pkgconfig by default, and is also _not_ part of the default pkg-config search path). This patch should not change the behavior for Linux installs. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reported-by: Alexander Nusov <alexander.nusov@nfvexpress.com> Acked-by: Wei Liu <wei.liu2@citrix.com> Release-acked-by: Wei Liu <wei.liu2@citrix.com>
* build: introduce XEN_RUN_STOREDWei Liu2016-06-171-0/+1
| | | | | | | | | | | It defaults to /var/run/xenstored. It will be used later to remove some hard-coded paths in tree. There should be no visible change to default configuration. Install and remove it in respective Makefile targets. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* build: introduce and export XEN_LIB_DIRWei Liu2016-06-141-0/+1
| | | | | | | | | | | This variable defaults to /var/lib/xen. It will be used to substitute various hard-coded paths in tools. The new variable points to $localstatedir/lib/xen, which defaults to /var/lib/xen, so there is no change in default configuration. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: allow configure time choice of libexec subdirectory.Ian Campbell2016-01-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | Currently we hardcode various paths such as $libexec/xen/{bin,boot}, however some downstreams (notably Debian) would like instead to install things into $libexec/xen-X.Y/{bin,boot} as part of allowing multiple versions of the tools packages to be installed. Since this currently involves patching configure its a bit fiddly, provide a configure option for the leaf dir instead, name it --with-libexec-leaf-dir similar to the existing --with-sysconfig-leaf-dir. Rather than have the determination of the full path in both configure and config/Paths.mk.in move it into configure only. Also for consistency move the other LIBEXEC_* to configure, even though they are only substituted into Paths.mk. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: Doug Goldstein <cardoe@cardoe.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Cc: 805508@bugs.debian.org [ ijc -- removed stray ` ]
* tools: add configure --with-dumpdir=DIR optionOlaf Hering2015-05-211-0/+1
| | | | | | | | | | | | | | | | | | | The current base directory /var/xen/dump for domU dumps will be patched to /var/lib/xen/dump by most distros to follow FHS. This change does three things: - change the default from /var/xen/dump to /var/lib/xen/dump - provide a configure option to avoid patching the source. - update docs to refer to the new default location Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- s,/var,LOCALSTATEDIR, in help test, ran autogen.sh ]
* tools: replace private DOCDIR with automake docdirOlaf Hering2015-05-211-1/+0
| | | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl DOCDIR | xargs sed -i 's@DOCDIR@docdir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private LIBDIR with automake libdirOlaf Hering2015-05-211-1/+0
| | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl LIBDIR | xargs sed -i 's@LIBDIR@libdir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private MANDIR with automake mandirOlaf Hering2015-05-211-3/+2
| | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl MANDIR | xargs sed -i 's@MANDIR@mandir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private INCLUDEDIR with automake includedirOlaf Hering2015-05-211-1/+0
| | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl INCLUDEDIR | xargs sed -i 's@INCLUDEDIR@includedir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private PREFIX with automake prefixOlaf Hering2015-05-211-2/+0
| | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. Only qemu-traditional expects PREFIX in environment, which is provided by buildmakevars2shellvars. Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private BINDIR with automake bindirOlaf Hering2015-05-211-1/+0
| | | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl BINDIR | xargs sed -i 's@BINDIR@bindir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* tools: replace private SBINDIR with automake sbindirOlaf Hering2015-05-211-1/+0
| | | | | | | | | | | | | | | | | | Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl SBINDIR | xargs sed -i 's@SBINDIR@sbindir@g' Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: Mukesh Rathor <mukesh.rathor@oracle.com> Cc: Tim Deegan <tim@xen.org> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> Cc: David Scott <dave.scott@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* libxl: provide xenlight.pcWei Liu2015-01-191-1/+1
| | | | | | | | | | | | | A pkg-config file for libxl. It also contains two variables (xenfirmwaredir and libexec_bin) so that tools that are very keen on knowing the locations of Xen binaries (say, libvirt) can use them to determine the location of the binaries. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- ran autogen.sh ]
* Use Paths.mk for docs, stubdom and tools buildOlaf Hering2014-10-061-0/+2
| | | | | | | | | | | | | | Paths.mk contains just directories set by configure. Source this file first when building docs,stubdom or tools. Remove unused path variables from $subsystem.mk. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@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>
* Make XENFIRMWAREDIR a subdir of libexecdirOlaf Hering2014-10-061-1/+1
| | | | | | | | | | | | | | Put the firmware files below libexecdir. This is essentially just a new name for the existing path. It has the benefit that it can be configured via --libexecdir= if required. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
* Add configure --with-sysconfig-leaf-dir=SUBDIR to set CONFIG_LEAF_DIROlaf Hering2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | Set CONFIG_LEAF_DIR with configure to give control if needed. The check for the correct value if the option is not specified is tricky. Since other packages (such as grub2) started to populate also /etc/default/ a given system may have both directories. Use "default" only if /etc/sysconfig does not exist. "sysconfig" remains the default. Move the variable from StdGNU.mk to Linux.mk because thats the only place where it is used. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
* Move variable to set bash_completion.d to Paths.mkOlaf Hering2014-10-061-0/+1
| | | | | | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com>
* Use configure --libexecdir=BASEDIR to set LIBEXECOlaf Hering2014-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ]
* Use configure --includedir=DIR to set INCLUDEDIROlaf Hering2014-10-061-0/+1
| | | | | | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com>
* Use configure --docdir=DIR to set DOCDIROlaf Hering2014-10-061-0/+1
| | | | | | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com>
* Use configure --mandir=DIR to set MANDIROlaf Hering2014-10-061-0/+3
| | | | | | | | | | | Also move common MAN8DIR and MAN1DIR to Paths.mk.in Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com>
* tools: substitute bindir instead of BINDIROlaf Hering2014-10-061-3/+3
| | | | | | | | | | | | | | ... and same for sbindir and libdir. Expand usage of exec_prefix so that it does not appear in substituted variables in systemd files. Signed-off-by: Olaf Hering <olaf@aepfle.de> Akced-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
* Substitue configure variables in Paths.mk.inOlaf Hering2014-10-061-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | This patch lays the groundwork to convert variables used in Makefiles to the common automake style, i.e. PREFIX becomes prefix, MANDIR becomes mandir and so on. The reason is that configure variables such as mandir expand to ${datarootdir}/man, and datarootdir expands to ${prefix}/share. This requires extra expansion in configure.ac before assigning to MANDIR. Special care must be taken when variable substition is done in other files, such as xencommons.in. All @VARIABLES@ used in these files have to be the expanded version, or all other variables must be available at runtime. This patch by itself changes nothing, but upcoming changes will make use of the lowercase variables. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com>
* remove duplicate variables from configOlaf Hering2014-10-061-1/+0
| | | | | | | | | | | | | | | | ... because they are already in Paths.mk: BINDIR, LIBEXEC, PRIVATE_BINDIR, PRIVATE_PREFIX, SBINDIR, SHAREDIR, XEN_CONFIG_DIR, XENFIRMWAREDIR, XEN_LOCK_DIR, XEN_PAGING_DIR, XEN_RUN_DIR. Remove unused PKG_XEN_PREFIX, which was also incorrectly assigned to PRIVATE_PREFIX. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
* Add configure --with-initddir=DIROlaf Hering2014-10-061-0/+1
| | | | | | | | | | | | | Preserve existing behaviour: Fedora gets rc.d/init.d, BSD gets rc.d, everyone else gets init.d. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
* autoconf: xen: move standard path variables to config/Paths.mk.inLuis R. Rodriguez2014-07-281-0/+37
This moves all generic path variables to a new the config/Paths.mk.in input source file to be processed at configure time, tons of files use these so this just share them. This also paves the way to let us easily dynamically configure these with autoconf, for now we leave the same presets as was present before. This work was prompted by looking for an autoconf way to do replacements for the hotplug global file, while at it I realized that a few other files use the same variables and have in places around the tree the same constructs for generating their own files. This makes use of the old buildmakevars2file() but generalizes the definition of the paths at configure time and spreads the new definitions out throughout the build system. This has no impact on building the hypervisor and extras/mini-os, you do not need to, and are not expected to, run configure to build those targets. While at it lets add some documentation on the for the two files on the source file, we can expand further details on the wiki [0]. [0] http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: Jan Beulich <jbeulich@suse.com> Cc: Keir Fraser <keir@xen.org> Cc: Tim Deegan <tim@xen.org> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> [ ijc -- reran autogen.sh ]
View Lorry Controller Status