search for: mlguestfs

* Richard W.M. Jones: >> Wouldn't a rule without commands such as >> >> mlguestfs.cmxa: mlguestfs.cma >> >> also prevent make from building the two targets in parallel? > > Doesn't that mean that if mlguestfs.cmxa is out of date, simply > running the mlguestfs.cma rule will build it (which it won't)? Not sure if I understand you. If I cause mlgue...

* Richard W.M. Jones: >> I think that an extra target (mlguestfs.cmxa: mlguestfs.cma) would make >> the .NOTPARALLEL unnecessary. > > Right, I remember this was a problem now. > > It was fixed by: > > https://github.com/libguestfs/libguestfs/commit/dce94f3e266ed3f1fc634a1ef6953f2db1510963 > > Do you think we could re-add the stamp-f...

...sion 3.79 and up of GNU make to not build goals in this >> +# directory in parallel. >> +.NOTPARALLEL: > > ^ This makes building the OCaml subdirectory very slow (I normally > build with MAKEFLAGS=-j9). Was there a reason for adding this? I think I added this because both the mlguestfs.cma and mlguestfs.cmxa targets generate libmlguestfs.a: mlguestfs.cma: libguestfsocaml.a guestfs.cmo $(OCAMLMKLIB) -o mlguestfs \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ -L$(top_builddir)/src/.libs -lguestfs mlguestfs.cmxa: libguestfsocaml.a guestfs.cmx $(OCAMLMKLIB) -o mlguestfs \...

...m | 6 +++++- v2v/Makefile.am | 9 +++++++-- 10 files changed, 58 insertions(+), 14 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 4e77f52..b2d5ad3 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -167,7 +167,11 @@ BEST = opt OCAMLLINKFLAGS = mlguestfs.cmxa mllib.cmxa customize.cmxa endif -virt_builder_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh +virt_builder_DEPENDENCIES = \ + $(OBJECTS) \ + ../mllib/mllib.$(MLARCHIVE) \ + ../customize/customize.$(MLARCHIVE) \ + $(top_srcdir)/ocaml-link.sh virt_builder_LINK = \ $(top_srcdir)/ocam...

...%.cmo,$(deps)) +endif + bin_SCRIPTS = virt-builder # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L @@ -134,12 +140,22 @@ OCAMLCLIBS = \ -pthread -lpthread \ -lncurses -lcrypt +if HAVE_OCAMLOPT virt-builder: $(OBJECTS) $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ -cclib '$(OCAMLCLIBS)' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ +else +virt-builder: $(OBJECTS) + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + mlguestfs.cma -linkpkg $^ \ + -cclib '$(OCAMLCLIBS)' \ + -custom \ + $(OCAML_GCOV_LDFLAGS) \ + -o $@ +endif .ml...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...0"; export CFLAGS > > +LDFLAGS="-fprofile-arcs -ftest-coverage -lgcov"; export LDFLAGS > > > +sed -i 's/^CFLAGS = -fprofile-arcs -ftest-coverage -g -O0/CFLAGS = /g' > > /home/mockbuild/rpmbuild/BUILD/libguestfs-1.36.5/ocaml/Makefile > > > ../libmlguestfs.a(libguestfsocaml_a-utils.o): In function > > `guestfs_int_string_is_valid': > > utils.c:(.text+0xb99): undefined reference to `c_isalpha' > > utils.c:(.text+0xbbf): undefined reference to `c_isdigit' > > I suppose that we need to link the OCaml bindings to -lgn...

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

* Richard W.M. Jones: > (1) Removing .NOTPARALLEL. This fails, as expected. > > (2) mlguestfs.cmxa: mlguestfs.cma -- fails > > (3) mlguestfs.cmxa: | mlguestfs.cma -- fails after a longer time I find it strange that (2) and (3) fail. > (4) The attached patch which is derived from dce94f -- this ran > without failing for 120 iterations (and still going). The patch looks good...

This just fixes 'make'. 'make check' is still broken. Further patches for that to follow tomorrow. Rich.

...FLAGS = $(OCAMLCFLAGS) +OCAMLOPTFLAGS = \ + -I $(top_builddir)/src/.libs \ + $(OCAMLCFLAGS) -virt-builder: $(OBJECTS) +virt-builder.bc: $(OBJECTS_bc) + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + -custom \ + mlguestfs.cma -linkpkg $^ \ + -cclib '-lncurses -lcrypt' \ + $(OCAML_GCOV_LDFLAGS) \ + -o $@ + +virt-builder.opt: $(OBJECTS_opt) $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ -cclib '-lncurses -lcrypt' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ +virt-bui...

At the moment OpenStack uses kpartx and nbd to resize filesystems and inject files to guests. I sincerely hope they don't allow untrusted users to upload guest images / AMIs :-( To fix this I'm looking into adding libguestfs support as an optional backend in OpenStack. The only missing feature in libguestfs is the ability to call tune2fs on a filesystem. This patch series adds tune2fs

...package unix -c guestfs.ml -o guestfs.cmx rm -f libguestfsocaml.a ar cr libguestfsocaml.a libguestfsocaml_a-guestfs-c.o libguestfsocaml_a-guestfs-c-actions.o libguestfsocaml_a-guestfs-c-errnos.o ../common/utils/libguestfsocaml_a-utils.o ../gnulib/lib/libgnu.la ranlib libguestfsocaml.a ocamlmklib -o mlguestfs \ libguestfsocaml_a-guestfs-c.o libguestfsocaml_a-guestfs-c-actions.o libguestfsocaml_a-guestfs-c-errnos.o ../common/utils/libguestfsocaml_a-utils.o guestfs.cmo \ -fprofile-arcs -ftest-coverage -lgcov \ \ -L../lib/.libs -lguestfs Unknown option -fprofile-arcs Unknown option -ftest-coverage...

...@@ -43,10 +43,20 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/ if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cmxa +endif +noinst_DATA += META # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we don't directly use this @@ -101,9 +111,13 @@ TESTS = r...

...uestfs_am_v_javac)$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d . $< endif diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index acbfad1..501ac69 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -158,12 +158,12 @@ check_DATA += bindtests.opt endif %.bc: %.cmo mlguestfs.cma - $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ + $(guestfs_am_v_ocamlc)$(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@...

Without this option, configure will fail when there is no display. Signed-off-by: Masami HIRATA <msmhrt at gmail.com> --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index de8a064..61d6f69 100644 --- a/configure.ac +++ b/configure.ac @@ -593,16 +593,16 @@ working. AC_MSG_FAILURE([$QEMU version must be >=

...commit 34c23403c51a4d59d826c8045e06f9aabc2ceb16. --- ocaml/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 752fc109c..4d13eed97 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -64,14 +64,14 @@ endif stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) $(OCAMLMKLIB) -o mlguestfs \ + -ldopt '$(LDFLAGS)' \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ - $(LDFLAGS) \ $(LTLIBINTL) \ -L../lib/.libs -lguestfs if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ + -ldopt '$(LDFLAGS)' \ $...

On Fri, Sep 01, 2017 at 04:28:52AM -0400, Yongkui Guo wrote: > > stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) > > $(OCAMLMKLIB) -o mlguestfs \ > > $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ > > $(LDFLAGS) \ > > $(LTLIBINTL) \ > > - -L../lib/.libs -lguestfs > > + -L../lib/.libs -lg...

There's a missing dependency in the ocaml subdirectory which causes this error whenever the main library changes: ocamlfind ocamlopt -cclib -L../src/.libs -I . unix.cmxa mlguestfs.cmxa t/guestfs_005_load.cmx -o t/guestfs_005_load File "_none_", line 1, characters 0-1: Error: Files t/guestfs_005_load.cmx and mlguestfs.cmxa make inconsistent assumptions over interface Guestfs make[3]: *** [t/guestfs_005_load] Error 2 The attached patch adds the missing dep to...

...not quite right. Here's the fix: >From 5294c21cf07c4ec2f094182ba9f32696f3de2751 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Mon, 23 Jan 2012 10:01:40 +0100 Subject: [PATCH libguestfs] build: don't use automake-internal variable * ocaml/Makefile.am (mlguestfs.cma): Use the documented variable form, $(libguestfsocaml_a_OBJECTS), not the $(am_libguestfsocaml_a_OBJECTS) that I suggested for commit 1.15.16-17-g8b9eaec. --- ocaml/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am ind...