From f31503574b793a74f4ce2d9904c9a274f59ef593 Mon Sep 17 00:00:00 2001 From: swrup Date: Sun, 2 Nov 2025 14:16:38 +0100 Subject: [PATCH] --- .gitignore | 19 ++++++---- .ocamlformat-ignore | 3 +- Makefile | 64 ++++++++++++++++++++++++++++++++++ data/tls/certificates/.gitkeep | 0 data/tls/keys/.gitkeep | 0 dune-project | 7 ++++ dune-workspace | 5 +++ src/dune | 5 ++- src/mte.ml | 1 + unikernel/config.ml | 14 ++++---- {src => unikernel}/connect.ml | 0 {src => unikernel}/server.ml | 0 unikernel/unikernel.ml | 3 +- 13 files changed, 102 insertions(+), 19 deletions(-) create mode 100644 Makefile create mode 100644 data/tls/certificates/.gitkeep create mode 100644 data/tls/keys/.gitkeep create mode 100644 dune-project create mode 100644 dune-workspace create mode 100644 src/mte.ml rename {src => unikernel}/connect.ml (100%) rename {src => unikernel}/server.ml (100%) diff --git a/.gitignore b/.gitignore index 0e6da31d..b07f00d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,13 @@ _build/ -mirage/ -dist/ -dune.build -dune.config -dune-project -dune-workspace -duniverse/ +data/tls/keys/** +!data/tls/keys/.gitkeep +data/tls/certificates/** +!data/tls/certificates/ +!data/tls/certificates/.gitkeep +unikernel/mirage/ +unikernel/dist/ +unikernel/dune.build +unikernel/dune.config +unikernel/dune-project +unikernel/dune-workspace +unikernel/duniverse/ diff --git a/.ocamlformat-ignore b/.ocamlformat-ignore index adfe12f6..1321bd1f 100644 --- a/.ocamlformat-ignore +++ b/.ocamlformat-ignore @@ -1 +1,2 @@ -dist/dune +unikernel/dist/* +unikernel/mirage/* diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..31b40978 --- /dev/null +++ b/Makefile @@ -0,0 +1,64 @@ +# Generated by mirage.v4.10.3 + +-include Makefile.user +BUILD_DIR = unikernel/ +MIRAGE_DIR = unikernel/mirage +UNIKERNEL_NAME = mte-unix +OPAM = opam + +all:: + @$(MAKE) --no-print-directory depends + @$(MAKE) --no-print-directory build + +.PHONY: all lock install-switch pull clean depend depends build repo-add repo-rm depext-lockfile + +repo-add: + @printf "\033[2musing overlay repository mirage: [opam-overlays, mirage-overlays] \033[0m\n" + $(OPAM) repo add opam-overlays https://github.com/dune-universe/opam-overlays.git || $(OPAM) repo set-url opam-overlays https://github.com/dune-universe/opam-overlays.git + $(OPAM) repo add mirage-overlays https://github.com/dune-universe/mirage-opam-overlays.git || $(OPAM) repo set-url mirage-overlays https://github.com/dune-universe/mirage-opam-overlays.git + + +repo-rm: + @printf "\033[2mremoving overlay repository [opam-overlays, mirage-overlays]\033[0m\n" + $(OPAM) repo remove opam-overlays https://github.com/dune-universe/opam-overlays.git + $(OPAM) repo remove mirage-overlays https://github.com/dune-universe/mirage-opam-overlays.git + + + +depext-lockfile: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked + echo " ↳ install external dependencies for monorepo" + env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo depext -y -l $< + + +$(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam + @$(MAKE) -s repo-add + @echo " ↳ generate lockfile for monorepo dependencies" + @env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo lock --require-cross-compile --build-only $(UNIKERNEL_NAME) -l $@ --ocaml-version $(shell ocamlc --version); (ret=$$?; $(MAKE) -s repo-rm && exit $$ret) + +lock:: + @$(MAKE) -B $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked + @echo "The lock file has been generated. Run 'make pull' to retrieve the sources, or 'make install-switch' to install the host dependencies." + +pull:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam.locked + @echo " ↳ fetch monorepo dependencies in the duniverse folder" + @env OPAMVAR_monorepo="opam-monorepo" $(OPAM) monorepo pull -l $< -r $(abspath $(BUILD_DIR)) + @echo "The sources have been pulled to the duniverse folder. Run 'make build' to build the unikernel." + +install-switch:: $(MIRAGE_DIR)/$(UNIKERNEL_NAME).opam + @echo " ↳ opam install switch dependencies" + @$(OPAM) install $< --deps-only --yes + @$(MAKE) -s depext-lockfile + @echo "The dependencies have been installed. Run 'make build' to build the unikernel." + +depends depend:: + @$(MAKE) --no-print-directory lock + @$(MAKE) --no-print-directory install-switch + @$(MAKE) --no-print-directory pull + +build:: + dune build --profile release --root . $(BUILD_DIR)dist + @echo "Your unikernel binary is now ready in $(BUILD_DIR)dist/mte" + @echo "Execute the binary using solo5-hvt, solo5-spt, xl, ..." + +clean:: + mirage clean diff --git a/data/tls/certificates/.gitkeep b/data/tls/certificates/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/data/tls/keys/.gitkeep b/data/tls/keys/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/dune-project b/dune-project new file mode 100644 index 00000000..e06b4ae5 --- /dev/null +++ b/dune-project @@ -0,0 +1,7 @@ +(lang dune 2.9) + +(name mte-unix) + +(implicit_transitive_deps true) + +;; Generated by mirage.v4.10.3 diff --git a/dune-workspace b/dune-workspace new file mode 100644 index 00000000..9f714f25 --- /dev/null +++ b/dune-workspace @@ -0,0 +1,5 @@ +(lang dune 2.9) + +(context (default)) + +;; Generated by mirage.v4.10.3 diff --git a/src/dune b/src/dune index 9bceb10f..5bbd0b24 100644 --- a/src/dune +++ b/src/dune @@ -1,5 +1,4 @@ (library - (wrapped false) (name mte) - (public_name mte) - (libraries logs hxd.core hxd.string)) + (wrapped false) + (libraries logs)) diff --git a/src/mte.ml b/src/mte.ml new file mode 100644 index 00000000..06ce6388 --- /dev/null +++ b/src/mte.ml @@ -0,0 +1 @@ +let uuu = "uuu" diff --git a/unikernel/config.ml b/unikernel/config.ml index 830a9ed1..2a6c4b87 100644 --- a/unikernel/config.ml +++ b/unikernel/config.ml @@ -5,8 +5,8 @@ type conn = Connect let conn = typ Connect -let minipaf = - main "Unikernel.Make" +let mte = + main "Unikernel.Make" ~local_libs:[ "mte" ] ~packages: [ package "digestif"; package ~min:"0.0.9" "mimic-happy-eyeballs"; @@ -27,8 +27,11 @@ let stackv4v6 = generic_stackv4v6 default_network let tcpv4v6 = tcpv4v6_of_stackv4v6 stackv4v6 let he = generic_happy_eyeballs stackv4v6 let dns = generic_dns_client stackv4v6 he -let certificates = crunch "data/tls/certificates" -let keys = crunch "data/tls/keys" + +(* note: if crunch says that directory doesn't exists, it may be because + it's empty and you need to run gen_tls.sh *) +let certificates = crunch "../data/tls/certificates" +let keys = crunch "../data/tls/keys" let conn = let happy_eyeballs = mimic_happy_eyeballs stackv4v6 he dns in @@ -38,5 +41,4 @@ let port = Runtime_arg.create ~pos:__POS__ "Unikernel.port" let http_server = paf_server ~port tcpv4v6 let () = - register "minipaf" - [ minipaf $ certificates $ keys $ tcpv4v6 $ conn $ http_server ] + register "mte" [ mte $ certificates $ keys $ tcpv4v6 $ conn $ http_server ] diff --git a/src/connect.ml b/unikernel/connect.ml similarity index 100% rename from src/connect.ml rename to unikernel/connect.ml diff --git a/src/server.ml b/unikernel/server.ml similarity index 100% rename from src/server.ml rename to unikernel/server.ml diff --git a/unikernel/unikernel.ml b/unikernel/unikernel.ml index 25f9d31c..3240533e 100644 --- a/unikernel/unikernel.ml +++ b/unikernel/unikernel.ml @@ -1,11 +1,10 @@ open Rresult open Lwt.Infix open Cmdliner -open Mte let port = let doc = Arg.info ~doc:"Port of HTTP service." [ "p"; "port" ] in - Arg.(value & opt int 8080 doc) + Arg.(value & opt int 3434 doc) let use_tls = let doc =