[PATCH v1 0/1] Oxenstored packaging fixes

[PATCH v1 0/1] Oxenstored packaging fixes

[Andrii Sultanov]

Following the work on stabilizing some interfaces used by oxenstored
to allow bringing it out of the xen tree, there are some additional
fixes needed around packaging the plugin interface.

With these changes, I was able to get the spec repo to build and the
forked oxenstored to launch properly on the host.

Andrii Sultanov (1):
  ocaml/libs: Remove xsd_glue_dev package, also install
    plugin_interface_v1.a

 tools/ocaml/libs/xsd_glue/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.39.5

[PATCH v1 1/1] ocaml/libs: Remove xsd_glue_dev package, also install plugin_interface_v1.a

[Andrii Sultanov]

xsd_glue_dev packaging is inconsistent with the rest of OCaml packages
and isn't actually necessary. .a is needed alongside compiled bytecode
files during linking and was missed in the initial oxenstore plugin
work.

Specify OCAMLCFLAGS along with OCAMLOPTFLAGS.

Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
---
 tools/ocaml/libs/xsd_glue/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/ocaml/libs/xsd_glue/Makefile b/tools/ocaml/libs/xsd_glue/Makefile
index f84291f7fe..be68642968 100644
--- a/tools/ocaml/libs/xsd_glue/Makefile
+++ b/tools/ocaml/libs/xsd_glue/Makefile
@@ -5,6 +5,7 @@ include $(OCAML_TOPLEVEL)/common.make
 SUBDIRS= domain_getinfo_plugin_v1
 
 CFLAGS += $(CFLAGS_xeninclude)
+OCAMLCFLAGS += -opaque
 OCAMLOPTFLAGS += -opaque
 
 OBJS = plugin_interface_v1
@@ -28,14 +29,11 @@ OCAML_NOC_LIBRARY = plugin_interface_v1
 install: $(LIBS) META subdirs-install
 	mkdir -p $(OCAMLDESTDIR)
 	$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
-	$(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue META $(INTF) $(LIBS)
-	$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
-	$(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue_dev META $(INTF) $(LIBS) *.ml *.mli
+	$(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue META $(INTF) $(LIBS) *.a
 
 .PHONY: uninstall
 uninstall: subdirs-uninstall
 	$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
-	$(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
 
 .PHONY: clean
 clean: subdirs-clean
-- 
2.39.5

Re: [PATCH v1 1/1] ocaml/libs: Remove xsd_glue_dev package, also install plugin_interface_v1.a

[Christian Lindig]

> On 9 Oct 2024, at 16:15, Andrii Sultanov <andrii.sultanov@cloud.com> wrote:
> 
> xsd_glue_dev packaging is inconsistent with the rest of OCaml packages
> and isn't actually necessary. .a is needed alongside compiled bytecode
> files during linking and was missed in the initial oxenstore plugin
> work.
> 
> Specify OCAMLCFLAGS along with OCAMLOPTFLAGS.
> 
> Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
> ---
> tools/ocaml/libs/xsd_glue/Makefile | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
> 

Acked-by: Christian Lindig <christian.lindig@cloud.com>

Re: [PATCH v1 1/1] ocaml/libs: Remove xsd_glue_dev package, also install plugin_interface_v1.a

[Frediano Ziglio]

On Wed, Oct 9, 2024 at 4:15 PM Andrii Sultanov
<andrii.sultanov@cloud.com> wrote:
>
> xsd_glue_dev packaging is inconsistent with the rest of OCaml packages
> and isn't actually necessary. .a is needed alongside compiled bytecode

Being singular, should not be "The <NAME>.a is needed "... ?
Or are there multiple archive files?

> files during linking and was missed in the initial oxenstore plugin
> work.
>
> Specify OCAMLCFLAGS along with OCAMLOPTFLAGS.
>
> Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
> ---
>  tools/ocaml/libs/xsd_glue/Makefile | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/tools/ocaml/libs/xsd_glue/Makefile b/tools/ocaml/libs/xsd_glue/Makefile
> index f84291f7fe..be68642968 100644
> --- a/tools/ocaml/libs/xsd_glue/Makefile
> +++ b/tools/ocaml/libs/xsd_glue/Makefile
> @@ -5,6 +5,7 @@ include $(OCAML_TOPLEVEL)/common.make
>  SUBDIRS= domain_getinfo_plugin_v1
>
>  CFLAGS += $(CFLAGS_xeninclude)
> +OCAMLCFLAGS += -opaque
>  OCAMLOPTFLAGS += -opaque
>
>  OBJS = plugin_interface_v1
> @@ -28,14 +29,11 @@ OCAML_NOC_LIBRARY = plugin_interface_v1
>  install: $(LIBS) META subdirs-install
>         mkdir -p $(OCAMLDESTDIR)
>         $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
> -       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue META $(INTF) $(LIBS)
> -       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
> -       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue_dev META $(INTF) $(LIBS) *.ml *.mli
> +       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue META $(INTF) $(LIBS) *.a
>
>  .PHONY: uninstall
>  uninstall: subdirs-uninstall
>         $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
> -       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
>
>  .PHONY: clean
>  clean: subdirs-clean

Frediano