search for: sources_m

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

...kefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mlstdutils/Makefile.am b/mlstdutils/Makefile.am index d29255e..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_...

....depend /mlvisit/visit_tests /mlxml/.depend diff --git a/mlv2v/Makefile.am b/mlv2v/Makefile.am index 9e82148..945f981 100644 --- a/mlv2v/Makefile.am +++ b/mlv2v/Makefile.am @@ -18,11 +18,74 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(generator_built) + $(generator_built) \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + $(SOURCES_C) -# Note: These are not compiled into a library. They are used directly -# by virt-v2v and are only located here because the files are -# generated (since the split). generator_built = \ uefi.mli \ uefi.ml + +SOURCES_MLI = \ + uefi.mli + +SOURCES_ML = \...

...diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7c71920c4..20440aaee 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -59,9 +59,13 @@ generator_built = \ structs.ml \ structs.mli +CONFIGURE_GENERATED_ML = \ + daemon_config.ml + EXTRA_DIST = \ $(generator_built) \ - $(SOURCES_MLI) $(SOURCES_ML) \ + $(SOURCES_MLI) \ + $(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \ daemon_utils_tests.ml \ guestfsd.pod @@ -297,7 +301,7 @@ SOURCES_MLI = \ utils.mli SOURCES_ML = \ - daemon_config.ml \ + $(CONFIGURE_GENERATED_ML) \ utils.ml \ structs.ml \ optgroups.ml...

*** 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

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

...emu-boot.c utils/qemu-speed-test/qemu-speed-test.c v2v/domainxml-c.c v2v/utils-c.c -v2v/xml-c.c +mllib/xml-c.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 4cf495555..1a21f825f 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -28,6 +28,8 @@ EXTRA_DIST = \ test-getopt.sh SOURCES_MLI = \ + xml.mli \ + xpath_helpers.mli \ checksums.mli \ common_utils.mli \ curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../cat/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \ progre...

...r/Makefile.am index 328775c..7983223 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -40,18 +40,6 @@ EXTRA_DIST = \ virt-index-validate.pod \ yajl_tests.ml -CLEANFILES = \ - *~ \ - *.annot \ - *.cache \ - *.cmi \ - *.cmo \ - *.cmx \ - *.cmxa \ - *.log \ - *.o \ - virt-builder - SOURCES_MLI = \ cache.mli \ cmdline.mli \ @@ -194,8 +182,6 @@ stamp-virt-builder.pod: virt-builder.pod $(top_srcdir)/customize/customize-synop $< touch $@ -CLEANFILES += stamp-virt-builder.pod virt-builder.1 - # Tests. TESTS_ENVIRONMENT = $(top_builddir)/run --test @@ -290,8 +276,6 @@ depe...

..., 66 insertions(+), 11 deletions(-) create mode 100644 sparsify/cmdline.mli diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 33f418b..d99f311 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -18,13 +18,16 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(SOURCES_ML) $(SOURCES_C) \ + $(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \ virt-sparsify.pod \ test-virt-sparsify.sh \ test-virt-sparsify-in-place.sh CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify +SOURCES_MLI = \ + cmdline.mli + SOURCES_ML = \ utils.ml \ cmdline.ml \ diff -...

.../osinfo.ml create mode 100644 mllib/osinfo.mli create mode 100644 mllib/osinfopath.ml diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 1a21f825f..eb9753e45 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(filter-out guestfs_config.ml libdir.ml,$(SOURCES_ML)) \ + $(filter-out guestfs_config.ml libdir.ml osinfopath.ml,$(SOURCES_ML)) \ $(SOURCES_C) \ common_utils_tests.ml \ getopt_tests.ml \ @@ -40,6 +40,7 @@ SOURCES_MLI = \ getopt.mli \ JSON.mli \ mkdtemp.mli \ + osinfo.mli \ pl...

...efile + daemon/daemon_config.ml daemon/Makefile df/Makefile dib/Makefile diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 994bcd61a..c534baab0 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -251,6 +251,7 @@ SOURCES_MLI = \ callbacks.mli \ chroot.mli \ daemon.mli \ + daemon_config.mli \ devsparts.mli \ file.mli \ filearch.mli \ @@ -279,6 +280,7 @@ SOURCES_MLI = \ utils.mli SOURCES_ML = \ + daemon_config.ml \ utils.ml \ structs.ml \ optgroups.ml \ diff --git a/daemon/daemon_config.ml.in b/d...

...100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -23,6 +23,7 @@ generator_built = \ BUILT_SOURCES = \ $(generator_built) \ + config.ml \ output_rhv_upload_createvm_source.ml \ output_rhv_upload_plugin_source.ml \ output_rhv_upload_precheck_source.ml @@ -48,6 +49,7 @@ EXTRA_DIST = \ SOURCES_MLI = \ changeuid.mli \ cmdline.mli \ + config.mli \ convert_linux.mli \ convert_windows.mli \ create_libvirt_xml.mli \ @@ -100,6 +102,7 @@ SOURCES_MLI = \ windows_virtio.mli SOURCES_ML = \ + config.ml \ types.ml \ uefi.ml \ utils.ml \ @@ -697,6 +700,7 @@ v2v_unit_tests_LINK = \...

This is just a bit of preparatory refactoring ... Rich.

...file.am +++ b/v2v/Makefile.am @@ -26,7 +26,8 @@ BUILT_SOURCES = \ config.ml \ output_rhv_upload_createvm_source.ml \ output_rhv_upload_plugin_source.ml \ - output_rhv_upload_precheck_source.ml + output_rhv_upload_precheck_source.ml \ + output_rhv_upload_vmcheck_source.ml EXTRA_DIST = \ $(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \ @@ -36,6 +37,7 @@ EXTRA_DIST = \ rhv-upload-createvm.py \ rhv-upload-plugin.py \ rhv-upload-precheck.py \ + rhv-upload-vmcheck.py \ var_expander_tests.ml \ v2v_unit_tests.ml \ virt-v2v.pod \ @@ -88,6 +90,7 @@ SOURCES_MLI = \ output_rhv_upload_createvm_s...

...n_gettext.ml +/mllib/common_gettext.mli /mllib/common_utils_tests /mllib/getopt_tests /mllib/JSON_tests diff --git a/builder/Makefile.am b/builder/Makefile.am index e1c7bd016..0bc8e86be 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -42,6 +42,7 @@ EXTRA_DIST = \ yajl_tests.ml SOURCES_MLI = \ + builder.mli \ cache.mli \ cmdline.mli \ downloader.mli \ @@ -50,11 +51,13 @@ SOURCES_MLI = \ ini_reader.mli \ languages.mli \ list_entries.mli \ + paths.mli \ pxzcat.mli \ setlocale.mli \ sigchecker.mli \ simplestreams_parser.mli \ sources.mli \ + utils.mli \ yajl.ml...

...4 builder/checksums.ml delete mode 100644 builder/checksums.mli create mode 100644 mllib/checksums.ml create mode 100644 mllib/checksums.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 7983223..5977d8b 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -44,7 +44,6 @@ SOURCES_MLI = \ cache.mli \ cmdline.mli \ downloader.mli \ - checksums.mli \ index.mli \ index_parser.mli \ ini_reader.mli \ @@ -61,7 +60,6 @@ SOURCES_ML = \ utils.ml \ pxzcat.ml \ setlocale.ml \ - checksums.ml \ index.ml \ ini_reader.ml \ yajl.ml \ diff --git a/builder/builder.ml b/b...

...efile + daemon/config_daemon.ml daemon/Makefile df/Makefile dib/Makefile diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 994bcd61a..4ac4e38d8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -250,6 +250,7 @@ SOURCES_MLI = \ btrfs.mli \ callbacks.mli \ chroot.mli \ + config_daemon.mli \ daemon.mli \ devsparts.mli \ file.mli \ @@ -279,6 +280,7 @@ SOURCES_MLI = \ utils.mli SOURCES_ML = \ + config_daemon.ml \ utils.ml \ structs.ml \ optgroups.ml \ diff --git a/daemon/config_daemon.ml.in b/daem...

Hi, this small series moves the OCaml Checksums module from virt-builder to mllib, adding more features to use it also for v2v. Thanks, Pino Toscano (4): mllib: move Checksums from builder mllib, builder: add and use Checksums.of_string mllib: add SHA1 support in Checksums v2v: -i ova: use Checksums builder/Makefile.am | 2 -- builder/builder.ml | 6 +++-

This works reliably for me ... Rich.

Adding missing opensuse.gpg to EXTRA_DIST. --- builder/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/Makefile.am b/builder/Makefile.am index 3111ef2..0d5ce3b 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -22,6 +22,7 @@ AM_YFLAGS = -d EXTRA_DIST = \ $(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \ libguestfs.gpg \ + opensuse.gpg \ test-index \ test-simplestreams/streams/v1/index.json \ test-simplestreams/streams/v1/net.cirros-cloud_released_download.json \ -- 2.1.4