similar to: [common PATCH] mlv2v: build as OCaml library

It is part of the common submodule but not used in libguestfs, so it is not included in distribution tarballs. --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1def6e0a3..d3cf64cc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -580,6 +580,7 @@ maintainer-check-extra-dist: ( git ls-files ; \ cd common; git ls-files | sed

*** BLURB HERE? *** Pino Toscano (4): build: stop shipping files generated by configure docs: fix out-of-source documentation build generator: do not generate mlv2v files when not needed perl: fix path to Build.PL docs/Makefile.am | 4 ++-- generator/main.ml | 11 +++++++---- perl/Makefile.am | 2 +- python/Makefile.am | 3 ++- tests/daemon/Makefile.am |

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

*** BLURB HERE? *** Pino Toscano (6): build: stop shipping files generated by configure docs: fix out-of-source documentation build generator: do not generate mlv2v files when not needed perl: fix path to Build.PL rust: fix path to lib.rs rust: fix list of generator-built files daemon/Makefile.am | 8 ++++++-- docs/Makefile.am | 4 ++-- generator/main.ml | 11

On Mon, Dec 16, 2019 at 03:58:29PM +0100, Pino Toscano wrote: > 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 | 2 ++ > Makefile.am | 2 +- > configure.ac | 2 +- > test-harness/Makefile.am | 2 +- > v2v/Makefile.am | 4

Looks like libguestfs build is broken, or not documented properly. I tried (based on http://libguestfs.org/guestfs-building.1.html): git clean -dxf ./autogen.sh autoreconf failes with: autoreconf: running: automake --add-missing --copy --no-force configure.ac:38: installing 'build-aux/missing' configure.ac:221: error: required file 'common/mlcustomize/Makefile.in' not found

ocaml-link.sh is generated file. It means that for out-of-tree builds it is located in a build directory which is different from source tree dir. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 64703c36..1c10d07b 100644 ---

They do not contain messages. --- Makefile.am | 1 + po/POTFILES-ml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4dde5002..46a52ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ po/POTFILES-ml: configure.ac grep -v '^common/mlprogress/' | \ grep -v '^common/mlvisit/' | \ grep -v

Building virt-v2v out-of-tree does not work and requires several small fixes here and there. Tomáš Golembiovský (3): build: perform gnulib check from source directory build: run ocaml-link.sh from build directory docs: don't perform lookup on absolute paths cfg.mk | 1 + podwrapper.pl.in | 2 ++ v2v/Makefile.am | 16 ++++++++-------- 3 files changed, 11 insertions(+), 8

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 | 2 ++ Makefile.am | 2 +- configure.ac | 2 +- test-harness/Makefile.am | 2 +- v2v/Makefile.am | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index

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

I got a little way into this. The two attached patches are preliminary work. My proposed split is: libguestfs.git common -> git submodule libguestfs-common.git generator/ lib/ all language bindings C based tools (eg. virt-df, virt-edit, guestfish) guestfs-tools.git common -> git submodule libguestfs-common.git

This is an extended version of: https://www.redhat.com/archives/libguestfs/2019-September/msg00288.html Apparently I forgot it on my tree, so I'm posting that series again, adding an extra cleanup more due to the v2v/common splits. Pino Toscano (6): tests: switch away from xgetcwd daemon: move read_whole_file to common utils daemon: switch from read_file to read_whole_file daemon:

Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml

On Wed, Dec 18, 2019 at 11:13:48AM +0100, Pino Toscano wrote: > They do not contain messages. > --- > Makefile.am | 1 + > po/POTFILES-ml | 11 ----------- > 2 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 4dde5002..46a52ca3 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -115,6 +115,7 @@ po/POTFILES-ml:

This way no non-namespaced OCaml C symbols are used, reducing the risk of clashes with other code. The only exception is ocaml-augeas, which does not build with CAML_NAME_SPACE; it will be fixed upstream, and it affects only ocaml-augeas itself. --- builder/Makefile.am | 2 ++ common/mllibvirt/Makefile.am | 1 + common/mlpcre/Makefile.am | 1 + common/mlprogress/Makefile.am | 1 +

Fix one dist issue, and various builddir!=srcdir issues, also with the patch proposed in the Debian bug #946594. Patch #3 applies also to the virt-v2v repository, and will be committed there too (with references to the libguestfs commit). Pino Toscano (3): inspector: ship the actual test script tests: fix srcdir references build: fix make implicit dependencies on ml/mli files

libvirt-ocaml is used only by virt-v2v, 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): common: Bundle the libvirt-ocaml library for use by virt-v2v build: switch embedded copy of libvirt-ocaml .gitignore | 2 + 3rdparty/libvirt-ocaml/Makefile.am |

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

Add a dummy C source, otherwise automake tries to look for e.g. common_utils_tests.c. Also, set check_PROGRAMS properly with them. --- mllib/Makefile.am | 48 +++++++++++++++++++++++++++++++++--------------- mllib/dummy.c | 2 ++ po/POTFILES | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 mllib/dummy.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am