search for: guestfs_config

This avoids build failures in separate builds such as this one: ,---- | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma | ar cr libmlstdutils.a libmlstdutils_a-dummy.o | ranlib libmlstdutils.a | File "_none_", line 1: | Error: Files std_utils.cmo and guestfs_config.cmo | make inconsistent assumptions over interface Guestfs_config | make...

...$ ./autogen.sh ... Next you should type 'make' to build the package, ... $ make make all-recursive make[1]: Entering directory '/home/nsoffer/src/virt-v2v' Making all in common/mlstdutils make[2]: Entering directory '/home/nsoffer/src/virt-v2v/common/mlstdutils' OCAMLOPT guestfs_config.cmx File "guestfs_config.ml", line 1: Error: guestfs_config.cmi is not a compiled interface for this version of OCaml. It seems to be for an older version of OCaml. make[2]: *** [Makefile:2321: guestfs_config.cmx] Error 2 make[2]: Leaving directory '/home/nsoffer/src/virt-v2v/c...

Just refactoring. Rich.

Use ./configure --sysconfdir setting. --- builder/paths.ml | 2 +- mllib/guestfs_config.ml.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/paths.ml b/builder/paths.ml index cbd9d4bd0..d7c4820bf 100644 --- a/builder/paths.ml +++ b/builder/paths.ml @@ -35,7 +35,7 @@ let xdg_config_home () = let xdg_config_dirs () = let dirs = try Sys.getenv &quot...

...uch to do with: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775761 > > So I just cloned the bug into #946594 in order to manage the bug reported > by Pierre Neyron. > > > However about this new bug, what is supposed to happen is that > > common/mlstdutils/guestfs_config.ml is generated by ./configure with > > the correct @host_cpu@ substituted. If that's not happening then it's > > a build issue on Debian of some kind. > > I closely look at the build system with him. It occurs that : > - the Debian package use an 'out-of-source...

Use ./configure --sysconfdir setting. --- builder/paths.ml | 2 +- mllib/guestfs_config.ml.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/paths.ml b/builder/paths.ml index cbd9d4bd0..9ce8504a1 100644 --- a/builder/paths.ml +++ b/builder/paths.ml @@ -35,7 +35,7 @@ let xdg_config_home () = let xdg_config_dirs () = let dirs = try Sys.getenv &quot...

On Tue, Jan 14, 2020 at 12:04:49AM +0100, Hilko Bengen wrote: > This avoids build failures in separate builds such as this one: > > ,---- > | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma > | ar cr libmlstdutils.a libmlstdutils_a-dummy.o > | ranlib libmlstdutils.a > | File "_none_", line 1: > | Error: Files std_utils.cmo and guestfs_config.cmo > | make inconsistent assumptions over interf...

On Tuesday, 14 January 2020 00:04:49 CET Hilko Bengen wrote: > This avoids build failures in separate builds such as this one: > > ,---- > | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma > | ar cr libmlstdutils.a libmlstdutils_a-dummy.o > | ranlib libmlstdutils.a > | File "_none_", line 1: > | Error: Files std_utils.cmo and guestfs_config.cmo > | make inconsistent assumptions over interf...

All of the GPG commands we run are compatible with either v1 or v2, so this simply involves changing the configure script to find either binary. --- builder/cmdline.ml | 2 +- docs/guestfs-building.pod | 17 ++++++++++++++++- m4/guestfs_progs.m4 | 19 +++++++++++++++++++ mllib/guestfs_config.ml.in | 1 + 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index aa852e8f5..5424e885a 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -87,7 +87,7 @@ let parse_cmdline () = let add_fingerprint arg = push_front arg fingerprints...

Rather complex patch to solve a small user error. Warn if the user is doing something like: virt-builder -o /dev/sdX1 Rich.

...5e..2b4aed8 100644 --- a/mlstdutils/Makefile.am +++ b/mlstdutils/Makefile.am @@ -19,9 +19,12 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(SOURCES_ML) \ + $(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \ std_utils_tests.ml +CONFIGURE_GENERATED_ML = \ + guestfs_config.ml + SOURCES_MLI = if HAVE_BYTES_COMPAT_ML @@ -41,7 +44,7 @@ SOURCES_ML += bytes.ml endif SOURCES_ML += \ - guestfs_config.ml \ + $(CONFIGURE_GENERATED_ML) \ stringMap.ml \ stringSet.ml \ std_utils.ml -- 2.23.0

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

v1 -> v2: - Fixed everything mentioned in patch review. - Libdir module is removed as a separate commit. Rich.

...ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always built as bytecode, and it depended on ‘../common/mlstdutils/guestfs_config.cmo’ and ‘../common/mlstdutils/std_utils.cmo’. On native code platforms these were not built before the generator and so the generator races to build the .cmi and .cmo files. Since the generator doesn't have correct dependencies covering the ‘common/mlstdutils’ directory you can get a broken...

...ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always built as bytecode, and it depended on ‘../common/mlstdutils/guestfs_config.cmo’ and ‘../common/mlstdutils/std_utils.cmo’. On native code platforms these were not built before the generator and so the generator races to build the .cmi and .cmo files. Since the generator doesn't have correct dependencies covering the ‘common/mlstdutils’ directory you can get a broken...

...caml{c,opt} -a’ instead. This > doesn't make any difference for native code, but for bytecode it was > building a broken library. > > The original reason for making this change is because the generator is > always built as bytecode, and it depended on > ‘../common/mlstdutils/guestfs_config.cmo’ and > ‘../common/mlstdutils/std_utils.cmo’. On native code platforms these > were not built before the generator and so the generator races to > build the .cmi and .cmo files. Since the generator doesn't have > correct dependencies covering the ‘common/mlstdutils’ directory y...

After debugging a virt-p2v issue with a customer in the middle of the night on Tuesday, I felt it would have been helpful to know exactly which version(s) of virt-p2v and virt-v2v they were using. That wasn't very clear from the log file I was provided with, so this change makes sure the information is included every time. Rich.

...value v2v_domain_exists (value connv, value domnamev)) -NO_LIBVIRT (value v2v_libvirt_get_version (value unitv)) - -#endif /* !HAVE_LIBVIRT */ diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 277d8f2c7..c056aa787 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -59,16 +59,10 @@ let rec main () = prog Guestfs_config.package_name Guestfs_config.package_version_full Guestfs_config.host_cpu; - (* Print the libvirt version if debugging. Note that if - * we're configured --without-libvirt, then this will throw - * an exception, but some conversions should still be possible, - * hence the try...

...the man page virt-v2v-copy-to-local(1). error (f_"too many command line parameters. See the virt-v2v-copy-to-local(1) manual page.") in (* Print the version, easier than asking users to tell us. *) - if verbose () then - printf "%s: %s %s (%s)\n%!" - prog Guestfs_config.package_name Guestfs_config.package_version Guestfs_config.host_cpu; + debug "%s: %s %s (%s)" + prog Guestfs_config.package_name + Guestfs_config.package_version Guestfs_config.host_cpu; (* Get the remote libvirt XML. *) message (f_"Fetching the remote libvirt...