[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v6 12/13] autoconf: xen: enable explicit preference option for xenstored preference
On Thu, 2014-06-12 at 18:18 -0700, Luis R. Rodriguez wrote: > Since the xenstored preference > is explicit now and since we require configure substitutions for it we > make use of the AX_XEN_EXPAND_CONFIG() helpers as otherwise substitution > for SBINDIR is not propagated from the top level configuration. I'm afraid I don't understand what is going on here. Why is SBINDIR not propagated? > Since we are now parsing an entry within Paths.mk.in on tools we let > the move the parsing of the file to be the tool's configure. I can't parse this. > [0] http://wiki.xen.org/wiki/Xenstored > [1] http://wiki.xen.org/wiki/XenStore > [2] http://wiki.xen.org/wiki/XenStoreReference > > Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> > Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> > Cc: Jan Beulich <jbeulich@xxxxxxxx> > Cc: Keir Fraser <keir@xxxxxxx> > Cc: Tim Deegan <tim@xxxxxxx> > Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx> > --- > > Please run autogen.sh after merging please. > > diff --git a/m4/xenstored.m4 b/m4/xenstored.m4 > new file mode 100644 > index 0000000..5a4d891 > --- /dev/null > +++ b/m4/xenstored.m4 > @@ -0,0 +1,60 @@ > +AC_DEFUN([AX_XEN_OCAML_XENSTORE_CHECK], [ > + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ > + AC_MSG_ERROR([Missing ocaml dependencies for oxenstored, try > installing ocaml ocaml-compiler-libs ocaml-runtime ocaml-findlib]) > + ]) > +]) > + > +AC_DEFUN([AX_XEN_OCAML_XENSTORE_DEFAULTS], [ > + xenstore="oxenstored" > + xenstored=$SBINDIR/oxenstored > + AS_IF([test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"], [ > + xenstore="xenstored" > + xenstored=$SBINDIR/xenstored > + ]) > +]) > + > +AC_DEFUN([AX_XENSTORE_OPTIONS], [ > +AS_IF([test "x$XENSTORE" = "x"], [ > +AC_ARG_WITH([xenstored], > + AS_HELP_STRING([--with-xenstored@<:@=oxenstored|xenstored@:>@], > + [This lets you choose which xenstore daemon you want, you have > + two options: the original xenstored written in C (xenstored) > + or the newer and robust one written in Ocaml (oxenstored). > + The oxenstored daemon is the default but will but can only > + be used if you have ocaml library / build dependencies solved, > + if you have not specified a preference and do not have ocaml > + dependencies resolved we'll enable the C xenstored for you. If > + you ask for oxenstored we'll complain until you resolve those > + dependencies]), > + [ > + AS_IF([test "x$withval" = "xxenstored"], [ > + xenstore=$withval > + xenstored=$SBINDIR/xenstored > + ]) > + AS_IF([test "x$withval" = "xoxenstored"], [ > + xenstore=$withval > + xenstored=$SBINDIR/oxenstored > + AX_XEN_OCAML_XENSTORE_CHECK() > + ]) > + AS_IF([test "x$withval" != "xoxenstored" && test "x$withval" != > "xxenstored"], [ > + AC_MSG_ERROR([Unsupported xenstored specified, > supported types: oxenstored xenstored]) > + ]) > + ], > + [ > + AX_XEN_OCAML_XENSTORE_DEFAULTS() > + ]) > +]) > +]) > + > +AC_DEFUN([AX_XENSTORE_SET], [ > + XENSTORE=$xenstore > + AC_SUBST(XENSTORE) This isn't used any more. > + > + AS_IF([test "x$XENSTORED" = "x"], [ > + XENSTORED=$xenstored > + ]) > + AC_SUBST(XENSTORED) > + > + AS_IF([test "x$XENSTORE" != "xxenstored" && test "x$XENSTORE" != > "xoxenstored"], > + [AC_MSG_ERROR([Invalid xenstore: $XENSTORE])]) You'll have already bailed from the previous incantation before you ever hit this, no? > diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons > b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in > similarity index 64% > rename from tools/hotplug/Linux/init.d/sysconfig.xencommons > rename to tools/hotplug/Linux/init.d/sysconfig.xencommons.in > index 25f7f00..d7d09ff 100644 > --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons > +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in > @@ -8,8 +8,17 @@ > ## Type: string > ## Default: xenstored > # > -# Select xenstored implementation > -#XENSTORED=[oxenstored|xenstored] > +# Select xenstore implementation, this can be either > +# of these below. If using systemd its preferred you "it's", and I think you are missing a "that" before you. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |