From 867de1e609580a016409b09626dfe3dc3bea9143 Mon Sep 17 00:00:00 2001
From: Andrii Sultanov <andrii.sultanov@cloud.com>
Date: Mon, 7 Oct 2024 09:33:18 +0100
Subject: [PATCH] fixup

Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
---
 Makefile                                   | 12 +++----
 ocaml-evtchn/dune-project                  |  1 +
 ocaml-evtchn/lib_test/dune                 | 25 +++++++++------
 xsd_glue/domain_getinfo_plugin_v1/Makefile | 37 ----------------------
 4 files changed, 20 insertions(+), 55 deletions(-)
 delete mode 100644 xsd_glue/domain_getinfo_plugin_v1/Makefile

diff --git a/Makefile b/Makefile
index d8c1934..7d8bd8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
-#
-# This Makefile is not called from Opam but only used for
-# convenience during development
-#
-
 DUNE 	= dune
 JOBS    = $(shell getconf _NPROCESSORS_ONLN)
 PROFILE = release
 
-.PHONY: build check test clean format
+.PHONY: build check test clean format install
 
 build:
 	$(DUNE) build -j $(JOBS) --profile=$(PROFILE)
 
+install: build
+	$(DUNE) install oxenstored
+
 check:
 	dune build @check -j $(JOBS)
 
@@ -30,5 +28,3 @@ utop:
 format:
 	$(DUNE) build --auto-promote @fmt
 	dune format-dune-file dune-project > $$$$ && mv $$$$ dune-project
-
-# vim:ts=8:noet:
diff --git a/ocaml-evtchn/dune-project b/ocaml-evtchn/dune-project
index 9437742..bb427aa 100644
--- a/ocaml-evtchn/dune-project
+++ b/ocaml-evtchn/dune-project
@@ -35,6 +35,7 @@ implementations:
  (authors "Vincent Hanquez" "Anil Madhavapeddy" "David Scott" "Jonathan Ludlam")
  (tags ("org:mirage" "org:xapi-project"))
  (synopsis "Xen event channel interface for Linux")
+ (allow_empty)
  (depends
    (ocaml (>= 4.03.0))
    dune
diff --git a/ocaml-evtchn/lib_test/dune b/ocaml-evtchn/lib_test/dune
index c0b7610..58c83b3 100644
--- a/ocaml-evtchn/lib_test/dune
+++ b/ocaml-evtchn/lib_test/dune
@@ -1,11 +1,16 @@
-(executables
- (names main)
- (libraries xen-evtchn xen-evtchn-unix ounit2))
+;(executable
+ ;(name main)
+ ;(public_name xen-evtchn-unix.test)
+ ;(package xen-evtchn-unix)
+ ;(optional)
+ ;(enabled_if %{lib-available:xen-evtchn-unix})
+ ;(libraries xen-evtchn xen-evtchn-unix ounit2))
 
-(rule
- (alias runtest)
- (package xen-evtchn-unix)
- (deps
-  (:< main.exe))
- (action
-  (run %{<})))
+;(rule
+ ;(alias runtest)
+ ;(enabled_if %{lib-available:xen-evtchn-unix})
+ ;(package xen-evtchn-unix)
+ ;(deps
+  ;(:< main.exe))
+ ;(action
+  ;(run %{<})))
diff --git a/xsd_glue/domain_getinfo_plugin_v1/Makefile b/xsd_glue/domain_getinfo_plugin_v1/Makefile
deleted file mode 100644
index 4be1fea..0000000
--- a/xsd_glue/domain_getinfo_plugin_v1/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-OCAML_TOPLEVEL=$(CURDIR)/../../..
-XEN_ROOT=$(OCAML_TOPLEVEL)/../..
-include $(OCAML_TOPLEVEL)/common.make
-
-CFLAGS += -I $(OCAML_TOPLEVEL)/libs -I $(OCAML_TOPLEVEL)/libs/xsd_glue
-CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) $(APPEND_CFLAGS)
-OCAMLOPTFLAGS += -opaque
-OCAMLINCLUDE += -I ./ -I ../
-
-OBJS = domain_getinfo_v1
-INTF = $(foreach obj, $(OBJS),$(obj).cmi)
-LIBS = domain_getinfo_v1.cmxa domain_getinfo_v1.cmxs
-
-LIBS_xsd_glue = $(call xenlibs-ldflags-ldlibs,xenctrl)
-
-all: $(INTF) $(LIBS) $(PROGRAMS)
-
-bins: $(PROGRAMS)
-
-libs: $(LIBS)
-
-domain_getinfo_v1_OBJS = $(OBJS)
-domain_getinfo_v1 = $(OBJS)
-domain_getinfo_v1_C_OBJS = domain_getinfo_stubs_v1
-
-OCAML_DYN_LIBRARY = domain_getinfo_v1
-
-.PHONY: install
-install: $(LIBS) META
-	$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/ocaml/xsd_glue/xenctrl_plugin
-	$(INSTALL_PROG) domain_getinfo_v1.cmxs $(DESTDIR)$(LIBEXEC)/ocaml/xsd_glue/xenctrl_plugin
-
-.PHONY: uninstall
-uninstall:
-	rm -f $(DESTDIR)$(LIBEXEC)/ocaml/xsd_glue/xenctrl_plugin/domain_getinfo_v1.cmxs
-
-include $(OCAML_TOPLEVEL)/Makefile.rules