similar to: [PATCH] build: build mlaugeas with -Wno-shift-negative-value

This commit bundles the ocaml-augeas library (upstream here: http://git.annexia.org/?p=ocaml-augeas.git;a=summary). It's identical to the upstream version and should remain so. We can work towards using system ocaml-augeas, when it's more widely available. --- .gitignore | 1 + Makefile.am | 1 + common/mlaugeas/Makefile.am | 91 +++++++++++++

GCC 9 gives this error which I believe is bogus: qemuopts.c: In function 'qemuopts_to_config_channel': qemuopts.c:987:29: error: '%.*s' directive output between 0 and 2147483647 bytes may exceed minimum required size of 4095 [-Werror=format-overflow=] 987 | fprintf (fp, " %.*s = ", (int) k, values[j]); | ^~~~

This synchronizes the embedded ocaml-augeas copy, and reimplements the augeas APIs using it (dropping all the C code). The behaviour seems unchanged, although I may have not tested all the various corner cases. Pino Toscano (5): common/mlaugeas: Synchronize with latest ocaml-augeas daemon: fix/enhance error reporting of Augeas exceptions Revert "Revert "daemon: implement

ocaml-augeas is used only by virtlibguestfs, so move it to this repository, instead of having it around in the common submodule. The removal from common will happen later. Pino Toscano (2): Bundle the ocaml-augeas library for use by libguestfs build: switch embedded copy of ocaml-augeas .gitignore | 1 + 3rdparty/ocaml-augeas/COPYING.LIB | 515

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 1 + Makefile.am | 6 +++--- configure.ac | 2 +- daemon/Makefile.am | 4 ++-- docs/guestfs-hacking.pod | 19 ++++++++++++++----- ocaml-dep.sh.in | 2 +- 6 files changed, 22 insertions(+), 12

Use also custom_compare_ext_default for the compare_ext field. According to the git logs, this was introduced in OCaml 3.12.1, which is earlier than out minimum required version. mlaugeas is not touched by this change, since it is a copy of a 3rd party library (and thus it will be fixed there first). --- common/mlpcre/pcre-c.c | 3 ++- common/mlprogress/progress-c.c | 3 ++-

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +- common/mltools/Makefile.am | 2 +- common/mlutils/Makefile.am | 2 +-

OCaml has a small runtime which is statically linked into the virt tools (providing things like GC and primitives). Since OCaml 4.03 it has been possible to select variants of this runtime, one of which is compiled with -fPIC, using ‘ocamlopt -runtime-variant _pic’. This has performance implications on i686, but is relatively free on other architectures. Since it (in theory) adds to the

Brought to you by the "I haven't rebuilt the libguestfs universe in a while" saga -- now with working test suite. Pino Toscano (5): build: remove extra gnulib submodule build: remove extra checks and submodules build: stop using gnulib in test-harness build: remove unused gnulib modules Remove extra entries from podfiles .gitmodules | 3 -- Makefile.am

On Tue, Oct 15, 2019 at 03:59:04PM +0200, Pino Toscano wrote: > On Tuesday, 15 October 2019 10:01:28 CEST Richard W.M. Jones wrote: > > I got a little way into this. The two attached patches are > > preliminary work. > > I see the work was done already, so I guess providing alternative ideas > (or opinions, apparently) is of no use now... It's always valued. >

Brought to you by the "I haven't rebuilt the libguestfs universe in a while" saga. Pino Toscano (5): build: remove extra gnulib submodule build: remove extra checks and submodules build: stop using gnulib in test-harness build: remove unused gnulib modules Remove extra entries from podfiles .gitmodules | 3 -- Makefile.am | 2 - bootstrap

common/mlutils: Unix_utils.StatVFS.statvfs: This commit implements a full-featured binding for the statvfs(3) function. We then use this to reimplement the daemon statvfs API in OCaml. Note that the Gnulib fallback is fixed in this commit. It previously referenced non-existent field names in the fs_usage struct. --- common/mlutils/unix_utils-c.c | 138 ++++++++++++++++++++++++++++---

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends Gbp-Pq: Name 0012-Fix-out-of-tree-builds-of-OCaml-components.patch --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +-

On Tuesday, 15 October 2019 10:01:28 CEST Richard W.M. Jones wrote: > I got a little way into this. The two attached patches are > preliminary work. I see the work was done already, so I guess providing alternative ideas (or opinions, apparently) is of no use now... > My proposed split is: > > libguestfs.git > common -> git submodule libguestfs-common.git

Do not build the mlv2v, and mllibvirt submodules, as they are not used. --- Makefile.am | 4 ---- configure.ac | 2 -- 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 28f542765..b1e88a42b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,10 +164,6 @@ SUBDIRS += common/mlvisit SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize

On Monday, 31 July 2017 17:40:51 CEST Richard W.M. Jones wrote: > This commit embeds the ocaml-augeas library (upstream here: > http://git.annexia.org/?p=ocaml-augeas.git;a=summary). It's identical > to the upstream version and should remain so. > > We can work towards using system ocaml-augeas, when it's more widely > available. > --- > daemon/Makefile.am |

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

v2 -> v3: - Drop gnulib fallback.

On Tuesday, 15 October 2019 18:39:32 CEST Richard W.M. Jones wrote: > On Tue, Oct 15, 2019 at 03:59:04PM +0200, Pino Toscano wrote: > > On Tuesday, 15 October 2019 10:01:28 CEST Richard W.M. Jones wrote: > > > I got a little way into this. The two attached patches are > > > preliminary work. > > > > I see the work was done already, so I guess providing

It started out as "this'll be just a simple fix ..." and turned into something a bit over-engineered in the end. Here it is anyway. Rich.