-
Notifications
You must be signed in to change notification settings - Fork 205
Upgrading Mirage Packages #646
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
e493f00 to
24caf7a
Compare
| Icmpv4_wire.set_icmpv4_id raw id'; | ||
| Icmpv4_wire.set_icmpv4_csum raw 0; | ||
| Icmpv4_wire.set_icmpv4_csum raw (Tcpip_checksum.ones_complement raw); | ||
| Cstruct.BE.set_uint16 raw 5 id'; (* TODO: Upstream *) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice catch, please upstream the missing bindings (from when I removed ppx_cstruct)
src/hostnet_test/dune
Outdated
| (libraries hostnet cmdliner alcotest logs.fmt protocol-9p mirage_dns | ||
| mirage-clock-unix charrua-client.mirage forwarder sha | ||
| mirage-random-stdlib arp.mirage) | ||
| mirage-random-stdlib arp.mirage tcpip.ipv6 mirage-crypto-rng.unix) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the mirage-random-stdlib is to be avoided (deprecated) and shouldn't be needed. Just use Mirage_crypto_rng directly (and Mirage_crypto_rng_unix.use_default ()).
b67aa9c to
c43daaa
Compare
|
I've pushed a few more patches, now the Dockerfile should build with OCaml 5.3 and opam 2.2 |
|
I'll rebase against master since there are now some integration tests running in CI |
This also allows VPNkit to be build with OCaml 5+ Signed-off-by: Patrick Ferris <[email protected]>
Signed-off-by: Patrick Ferris <[email protected]>
Signed-off-by: Patrick Ferris <[email protected]>
Signed-off-by: Patrick Ferris <[email protected]>
Signed-off-by: David Scott <[email protected]>
In particular io-page-unix needs recent opam Signed-off-by: David Scott <[email protected]>
Signed-off-by: David Scott <[email protected]>
Signed-off-by: David Scott <[email protected]>
There is some unexpected hidden state somewhere which is causing
with_stack called in test case with the same UUID as a previous case,
to discover the same IP binding ("Reconnecting ...") Perhaps the DHCP
server remembers the MAC?
Signed-off-by: David Scott <[email protected]>
Signed-off-by: David Scott <[email protected]>
|
ocaml-ci seems unhappy with: |
|
Dear @djs55, impressive work. For the mirage-time/fake-time, I don't think dune variants work across packages (they used to, but there was some bad things happening). But we have a mirage-mtime.mock available (see https://github.com/mirage/mirage-mtime/tree/main/mock), used i. mirage-tcpip tests https://github.com/mirage/mirage-tcpip/tree/main/test/mock-clock I'm on vacation without my laptop for the next weeks, so please excusive my brevity, and if I'm missing something (hard to grasp big changes on a tiny mobile screen). |
src/hostnet/dune
Outdated
| mirage-vnetif uuidm cohttp-lwt mirage-channel ezjsonm | ||
| duration mirage-time mirage-clock | ||
| mirage-random tcpip.checksum forwarder cstructs sha) | ||
| duration mirage-time |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess you can drop mirage-time now here as well.
|
I couldn't stand this anymore, and prepared patricoferris#1 with more details what is needed. Let me know if this works for you, and the plan to cut the releases resonates with you. |
* some minor tweak, reuse the mirage-mtime.mock implementation * opam: update bounds (requires opam releases being merged)
|
There are two ocaml-ci errors: and I've no clue why this fails -- the first there's a dependency on |
|
see patricoferris#2 which makes |
A few remarks about this PR:
This PR will depend on updating hvsock (mirage/ocaml-hvsock#69) and ocaml-9p (mirage/ocaml-9p#146).
I was also struggling to build on nixos, but I'll work on that.