From patchwork Mon Jun 13 07:49:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9172249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 272A0604DB for ; Mon, 13 Jun 2016 07:51:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F123E20499 for ; Mon, 13 Jun 2016 07:51:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E60A727AC2; Mon, 13 Jun 2016 07:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1406A20499 for ; Mon, 13 Jun 2016 07:51:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCMce-0005xK-8f; Mon, 13 Jun 2016 07:49:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCMcc-0005uY-Dg for xen-devel@lists.xenproject.org; Mon, 13 Jun 2016 07:49:22 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 00/21-05219-1856E575; Mon, 13 Jun 2016 07:49:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpG5jaly 4we/JnBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bV64+YCs65VEy5dY+5gbHRoouRk0NCwF/i 647bjCA2m4CyxM/OXjYQW0RAT6LpwHOwOLOAl8SLdf/AbGEBA4lD726ygtgsAqoSm19/Zwaxe QVcJHr33WCEmCkncf74T6A4BwcnUPzJO3OQsJCAs0TDrMPMELaCRMf0Y0wQrYISJ2c+YYFYJS Fx8MULZogx3BK3T09lnsDINwtJ2SwkZQsYmVYxahSnFpWlFukaGuslFWWmZ5TkJmbm6Boamuj lphYXJ6an5iQmFesl5+duYgSGVD0DA+MOxl3bPQ8xSnIwKYnySvjEhQvxJeWnVGYkFmfEF5Xm pBYfYpTh4FCS4JUChqiQYFFqempFWmYOMLhh0hIcPEoivGwgad7igsTc4sx0iNQpRkUpcd64F KCEAEgiozQPrg0WUZcYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqCfN+BJnCk5lXAjf9FdBiJq DFHPuiQRaXJCKkpBoYZW5t2t8X9ejKT5V8xYYdOatbs+7OmGfOsOqKZL59ydw01/nCb3WKl/b 8LtONe/lHf/WTrLcc/VYM2xpCzqTL52wq3HElfIvqz4nGwfGzZdh+zl4dp3UlX1hn/Vy3pKJO zZOHHJoSz6420KxkZM68t+hs8M4fFUxHFPWlZC5zPCjq03/2wPeIEktxRqKhFnNRcSIAgBVDT KMCAAA= X-Env-Sender: prvs=9655a08af=wei.liu2@citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1465804159!35155443!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52594 invoked from network); 13 Jun 2016 07:49:20 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Jun 2016 07:49:20 -0000 X-IronPort-AV: E=Sophos;i="5.26,466,1459814400"; d="scan'208";a="359992707" From: Wei Liu To: Xen-devel Date: Mon, 13 Jun 2016 08:49:07 +0100 Message-ID: <1465804155-14469-10-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> References: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH 09/17] docs: honour XEN_DUMP_DIR X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use configure to generate xl.cfg and xl manpage. Add the generated files to gitignore. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Cc: Ian Jackson Not entirely sure if this is a good idea. I don't deem this patch important so I'm fine with dropping it. I've committed the result of running autogen.sh here. Please rerun autogen.sh if necessary. --- .gitignore | 2 + docs/configure | 184 ++++++++++++++++++++++++++++- docs/configure.ac | 9 +- docs/man/{xl.cfg.pod.5 => xl.cfg.pod.5.in} | 6 +- docs/man/{xl.pod.1 => xl.pod.1.in} | 2 +- 5 files changed, 197 insertions(+), 6 deletions(-) rename docs/man/{xl.cfg.pod.5 => xl.cfg.pod.5.in} (99%) rename docs/man/{xl.pod.1 => xl.pod.1.in} (99%) diff --git a/.gitignore b/.gitignore index 496194f..8e0a177 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,8 @@ config/Paths.mk build-* dist/* docs/html/ +docs/man/xl.cfg.pod.5 +docs/man/xl.pod.1 docs/man1/ docs/man5/ docs/man8/ diff --git a/docs/configure b/docs/configure index fbb78ac..46f0e68 100755 --- a/docs/configure +++ b/docs/configure @@ -594,6 +594,24 @@ POD2TEXT POD2HTML POD2MAN FIG2DEV +XEN_DUMP_DIR +XEN_PAGING_DIR +XEN_LOCK_DIR +XEN_SCRIPT_DIR +XEN_CONFIG_DIR +INITD_DIR +CONFIG_DIR +SHAREDIR +XEN_LIB_DIR +XEN_LIB_STORED +XEN_LOG_DIR +XEN_RUN_DIR +XENFIRMWAREDIR +LIBEXEC_INC +LIBEXEC_LIB +LIBEXEC_BIN +LIBEXEC +CONFIG_LEAF_DIR target_alias host_alias build_alias @@ -635,6 +653,10 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +with_initddir +with_sysconfig_leaf_dir +with_libexec_leaf_dir +with_xen_dumpdir ' ac_precious_vars='build_alias host_alias @@ -1251,6 +1273,21 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-initddir=DIR Path to directory with sysv runlevel scripts. + [SYSCONFDIR/init.d] + --with-sysconfig-leaf-dir=SUBDIR + Name of subdirectory in /etc to store runtime + options for runlevel scripts and daemons such as + xenstored. This should be either "sysconfig" or + "default". [sysconfig] + --with-libexec-leaf-dir=SUBDIR + Name of subdirectory in libexecdir to use. + --with-xen-dumpdir=DIR Path to directory for domU crash dumps. + [LOCALSTATEDIR/lib/xen/dump] + Some influential environment variables: FIG2DEV Path to fig2dev tool POD2MAN Path to pod2man tool @@ -1693,7 +1730,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Docs.mk" +ac_config_files="$ac_config_files ../config/Docs.mk man/xl.cfg.pod.5 man/xl.pod.1" ac_aux_dir= for ac_dir in ../ "$srcdir"/../; do @@ -1741,6 +1778,149 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + +test "x$prefix" = "xNONE" && prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} + +if test "$localstatedir" = '${prefix}/var' ; then + localstatedir=/var +fi + +bindir=`eval echo $bindir` +sbindir=`eval echo $sbindir` +libdir=`eval echo $libdir` + +if test "x$sysconfdir" = 'x${prefix}/etc' ; then + case "$host_os" in + *freebsd*) + sysconfdir=$prefix/etc + ;; + *solaris*) + if test "$prefix" = "/usr" ; then + sysconfdir=/etc + else + sysconfdir=$prefix/etc + fi + ;; + *) + sysconfdir=/etc + ;; + esac +fi + + +# Check whether --with-initddir was given. +if test "${with_initddir+set}" = set; then : + withval=$with_initddir; initddir_path=$withval +else + case "$host_os" in + *linux*) + if test -d $sysconfdir/rc.d/init.d ; then + initddir_path=$sysconfdir/rc.d/init.d + else + initddir_path=$sysconfdir/init.d + fi + ;; + *) + initddir_path=$sysconfdir/rc.d + ;; + esac +fi + + + +# Check whether --with-sysconfig-leaf-dir was given. +if test "${with_sysconfig_leaf_dir+set}" = set; then : + withval=$with_sysconfig_leaf_dir; config_leaf_dir=$withval +else + config_leaf_dir=sysconfig + if test ! -d /etc/sysconfig ; then config_leaf_dir=default ; fi +fi + +CONFIG_LEAF_DIR=$config_leaf_dir + + + +# Check whether --with-libexec-leaf-dir was given. +if test "${with_libexec_leaf_dir+set}" = set; then : + withval=$with_libexec_leaf_dir; libexec_subdir=$withval +else + libexec_subdir=$PACKAGE_TARNAME +fi + + + +# Check whether --with-xen-dumpdir was given. +if test "${with_xen_dumpdir+set}" = set; then : + withval=$with_xen_dumpdir; xen_dumpdir_path=$withval +else + xen_dumpdir_path=$localstatedir/lib/xen/dump +fi + + +if test "$libexecdir" = '${exec_prefix}/libexec' ; then + case "$host_os" in + *netbsd*) ;; + *) + libexecdir='${exec_prefix}/lib' + ;; + esac +fi +LIBEXEC=`eval echo $libexecdir/$libexec_subdir` + + +LIBEXEC_BIN=${LIBEXEC}/bin + +LIBEXEC_LIB=${LIBEXEC}/lib + +LIBEXEC_INC=${LIBEXEC}/include + +XENFIRMWAREDIR=${LIBEXEC}/boot + + +XEN_RUN_DIR=$localstatedir/run/xen + + +XEN_LOG_DIR=$localstatedir/log/xen + + +XEN_LIB_STORED=$localstatedir/lib/xenstored + + +XEN_LIB_DIR=$localstatedir/lib/xen + + +SHAREDIR=$prefix/share + + +CONFIG_DIR=$sysconfdir + + +INITD_DIR=$initddir_path + + +XEN_CONFIG_DIR=$CONFIG_DIR/xen + + +XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + + +case "$host_os" in +*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*) XEN_LOCK_DIR=$localstatedir/lock ;; +esac + + +XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging + + +XEN_DUMP_DIR=$xen_dumpdir_path + + + + + # Extract the first word of "fig2dev", so it can be a program name with args. set dummy fig2dev; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -2793,6 +2973,8 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Docs.mk") CONFIG_FILES="$CONFIG_FILES ../config/Docs.mk" ;; + "man/xl.cfg.pod.5") CONFIG_FILES="$CONFIG_FILES man/xl.cfg.pod.5" ;; + "man/xl.pod.1") CONFIG_FILES="$CONFIG_FILES man/xl.pod.1" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/docs/configure.ac b/docs/configure.ac index bc77f49..a2929c4 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -5,13 +5,20 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor Documentation], m4_esyscmd([../version.sh ../xen/Makefile]), [xen-devel@lists.xen.org], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([misc/xen-command-line.markdown]) -AC_CONFIG_FILES([../config/Docs.mk]) +AC_CONFIG_FILES([ +../config/Docs.mk +man/xl.cfg.pod.5 +man/xl.pod.1 +]) AC_CONFIG_AUX_DIR([../]) # M4 Macro includes m4_include([../m4/docs_tool.m4]) m4_include([../m4/path_or_fail.m4]) m4_include([../m4/features.m4]) +m4_include([../m4/paths.m4]) + +AX_XEN_EXPAND_CONFIG() AX_DOCS_TOOL_PROG([FIG2DEV], [fig2dev]) AX_DOCS_TOOL_PROG([POD2MAN], [pod2man]) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5.in similarity index 99% rename from docs/man/xl.cfg.pod.5 rename to docs/man/xl.cfg.pod.5.in index 4a8bf51..3bb27d0 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5.in @@ -343,12 +343,12 @@ destroy`. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F<@XEN_DUMP_DIR@/NAME> and then destroy the domain. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F<@XEN_DUMP_DIR@/NAME> and then restart the domain. =item B @@ -2017,7 +2017,7 @@ natively or via hardware backwards compatibility support. =head1 FILES F -F +F<@XEN_DUMP_DIR@/NAME> =head1 BUGS diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1.in similarity index 99% rename from docs/man/xl.pod.1 rename to docs/man/xl.pod.1.in index f4dc32c..c1e6b7f 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1.in @@ -280,7 +280,7 @@ Change the domain name of I to I. Dumps the virtual machine's memory for the specified domain to the I specified, without pausing the domain. The dump file will be written to a distribution specific directory for dump files. Such -as: /var/lib/xen/dump. +as: @XEN_DUMP_DIR@/dump. =item B [I<--long>]