search for: bobject

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

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

...t;ocamlfind byte" which did not work. --- Makefile.am | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 109d2c8..4dc6f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,18 +56,18 @@ SOURCES_ML = $(filter %.ml,$(SOURCES)) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) -if !HAVE_OCAMLOPT -OBJECTS = $(BOBJECTS) -else -OBJECTS = $(XOBJECTS) -endif - OCAMLPACKAGES = -package unix,str OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ -febootstrap: $(OBJECTS) - $(OCAMLFIND) $(OCAMLBEST) $(OCAMLFLAGS) $(OCAMLPACKA...

...2V_CMA = mlv2v.cma +else +MLV2V_CMA = mlv2v.cmxa +endif + +noinst_DATA = $(MLV2V_CMA) + +libmlv2v_a_SOURCES = $(SOURCES_C) +libmlv2v_a_CPPFLAGS = \ + -DCAML_NAME_SPACE \ + -I. \ + -I$(top_builddir) \ + -I$(shell $(OCAMLC) -where) +libmlv2v_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + -fPIC + +BOBJECTS = $(SOURCES_ML:.ml=.cmo) +XOBJECTS = $(BOBJECTS:.cmo=.cmx) + +OCAMLPACKAGES = \ + -package str,unix \ + -I $(builddir) +OCAMLPACKAGES_TESTS = $(MLV2V_CMA) + +OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' + +if !HAVE_OCAMLOPT +OBJECTS = $(BOBJECTS) +else +OBJECTS = $(XO...

...IVE) \ + ../customize/customize.$(MLARCHIVE) \ + $(top_srcdir)/ocaml-link.sh virt_builder_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ @@ -236,7 +240,11 @@ yajl_tests_THEOBJECTS = $(yajl_tests_BOBJECTS) yajl_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) endif -yajl_tests_DEPENDENCIES = $(yajl_tests_THEOBJECTS) $(top_srcdir)/ocaml-link.sh +yajl_tests_DEPENDENCIES = \ + $(yajl_tests_THEOBJECTS) \ + ../mllib/mllib.$(MLARCHIVE) \ + ../customize/customize.$(MLARCHIVE) \ + $(top_srcdir)/ocaml...

--- src/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7f99b8a..932881b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,17 +104,18 @@ supermin_CFLAGS = \ BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) +OCAMLPACKAGES = -package unix,str +OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ + if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) BEST = c +OCAMLFLAGS += -custom else OBJECTS = $(XOBJECTS) BEST = opt endif -OCAMLPACKAGES = -package un...

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

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).

...rcdir)/mllib/index-struct.c \ + $(top_srcdir)/mllib/index-parser-c.c \ crypt-c.c \ perl_edit-c.c @@ -85,7 +89,8 @@ virt_customize_CPPFLAGS = \ virt_customize_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBVIRT_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + -Wno-unused-macros BOBJECTS = \ $(top_builddir)/mllib/config.cmo \ @@ -93,6 +98,7 @@ BOBJECTS = \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/regedit.cmo \ $(top_builddir)/mllib/uRI.cmo \ + $(top_builddir)/mllib/ini_reader.cmo \ $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) diff --gi...

...once, but I'm a bit uncomfortable with editing Makefiles and therefore I wanted to keep my changes small. Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 48b3420..dfd50c1 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,14 @@ BOBJECTS = $(BTARGET) \ mbr/*.bin \ core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \ gpxe/gpxelinux.0 dos/syslinux.com \ - win32/syslinux.exe win64/syslinux64.exe \ dosutil/*.com dosutil/*.sys \ $(MODULES) +ifeq ($(shell win32/find-mingw32.sh gcc >/dev/null 2>&1 ; echo $$?),...

Just refactoring. Rich.

We can use the setfiles(8) command to relabel the guest filesystem, even though we don't have a policy loaded nor SELinux enabled in the appliance kernel. This also deprecates or removes the old and broken SELinux support. This patch isn't quite complete - I would like to add some tests to the new API. I'm posting here to garner early feedback. Rich.

...vmuid-c.c \ utils-c.c \ @@ -117,8 +112,7 @@ virt_v2v_CPPFLAGS = \ -I. \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/fish + -I$(top_srcdir)/src virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(LIBXML2_CFLAGS) \ @@ -129,20 +123,10 @@ BOBJECTS = \ $(top_builddir)/mllib/common_gettext.cmo \ $(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/regedit.cmo \ - $(top_builddir)/mllib/progress.cmo \ $(top_builddir)/mllib/mkdtemp.cmo \ $(top_builddir)/mllib/JSON.cmo \ $(top_builddir)/customize/customize_utils.cmo \ - $(to...

v1 -> v2: - Add simple test of the setfiles API. - Use SELinux_relabel module in virt-v2v (instead of touch /.autorelabel). - Small fixes. Rich.

...ls/Makefile.am b/mlutils/Makefile.am index e86d7bb..38a683f 100644 --- a/mlutils/Makefile.am +++ b/mlutils/Makefile.am @@ -63,7 +63,8 @@ libmlcutils_a_CPPFLAGS = \ -I$(shell $(OCAMLC) -where) libmlcutils_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - -fPIC + -fPIC \ + $(LIBGUESTFS_CFLAGS) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) diff --git a/options/Makefile.am b/options/Makefile.am index 394f668..b38fedc 100644 --- a/options/Makefile.am +++ b/options/Makefile.am @@ -45,7 +45,8 @@ liboptions_la_CPPFLAGS = \ liboptions_la_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAG...

...48cd5f0..a7d4166 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -72,7 +72,7 @@ if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif -OCAMLFLAGS = -g -warn-error CDEFLMPSUVYZX-3 +OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index b1cebc2..6c760a8 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -130,7 +130,7 @@ if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif -OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX-3 $(OCAMLPACKAGES) +O...

v1 was here: https://www.redhat.com/archives/libguestfs/2017-November/msg00068.html v1 -> v2: - Use a configure-time test. Rich.

...ir)/gnulib/lib \ + -I$(top_srcdir)/common/cleanups -I$(top_builddir)/common/cleanups \ + -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(shell $(OCAMLC) -where) +libmlcutils_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + -fPIC + +BOBJECTS = $(SOURCES_ML:.ml=.cmo) +XOBJECTS = $(BOBJECTS:.cmo=.cmx) + +OCAMLPACKAGES = \ + -package str,unix \ + -I $(top_builddir)/gnulib/lib/.libs \ + -I $(top_builddir)/common/utils/.libs \ + -I $(top_builddir)/common/cleanups/.libs \ + -I $(top_builddir)/common/mlstdutils \ + -I $(builddir) + +OCAMLFLA...

...MA = mlaugeas.cmxa +endif + +noinst_DATA = $(MLAUGEAS_CMA) + +libmlaugeas_a_SOURCES = $(SOURCES_C) +libmlaugeas_a_CPPFLAGS = \ + -I. \ + -I$(top_builddir) \ + -I$(shell $(OCAMLC) -where) +libmlaugeas_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ + -fPIC + +BOBJECTS = $(SOURCES_ML:.ml=.cmo) +XOBJECTS = $(BOBJECTS:.cmo=.cmx) + +OCAMLPACKAGES = +OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) + +if !HAVE_OCAMLOPT +OBJECTS = $(BOBJECTS) +else +OBJECTS = $(XOBJECTS) +endif + +libmlaugeas_a_DEPENDENCIES = $(OBJECTS) + +$(MLAUGEAS_CMA): $(OBJECTS) libmlaugeas.a + $...

...dir) \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(shell $(OCAMLC) -where) \ -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/common/utils \ -I$(top_srcdir)/common/utils \ -I$(top_srcdir)/lib virt_builder_CFLAGS = \ @@ -163,7 +164,7 @@ XOBJECTS = $(BOBJECTS:.cmo=.cmx) virt_builder_repository_SOURCES = $(REPOSITORY_SOURCES_C) virt_builder_repository_CPPFLAGS = \ - -I. \ + -I$(builddir) -I$(srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ -I$(shell $(OCAMLC) -where) \ @@ -446,7 +447,7 @@ CLEANFILES += \...