Backport ETHIF, IP, tcpip MTU fixes

This is from mirage/mirage-tcpip#288 mirage/mirage-protocols#4 Signed-off-by: David Scott <dave.scott@docker.com>
djs55 · Jan 23, 2017 · c4d9e6e · c4d9e6e
1 parent 300e0ad
commit c4d9e6e
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 2 deletions.
diff --git a/repo/darwin/packages/dev/mirage-types-lwt.2.8.999/descr b/repo/darwin/packages/dev/mirage-types-lwt.2.8.999/descr
@@ -0,0 +1,14 @@
+Lwt module type definitions for Mirage-compatible applications
+
+This is a virtual package that pulls in all the concrete
+dependencies required for the `mirage-types.lwt` ocamlfind
+package to become available.
+
+The purpose of this library is to provide concrete types
+for several that are left abstract in `mirage-types`:
+
+- `type 'a io = 'a Lwt.t`
+- `type page_aligned_buffer = Io_page.t`
+- `type buffer = Cstruct.t`
+- `type macaddr = Macaddr.t`
+- `type ipv4addr = Ipaddr.V4.t`
diff --git a/repo/darwin/packages/dev/mirage-types-lwt.2.8.999/opam b/repo/darwin/packages/dev/mirage-types-lwt.2.8.999/opam
@@ -0,0 +1,16 @@
+opam-version: "1.2"
+maintainer:   ["anil@recoil.org" "thomas@gazagnaire.org"]
+authors:      "The MirageOS team"
+homepage:     "https://github.com/mirage/mirage"
+bug-reports:  "https://github.com/mirage/mirage/issues/"
+dev-repo:     "https://github.com/mirage/mirage.git"
+tags:         ["org:mirage" "org:xapi-project"]
+
+depends: [
+  "ocamlfind"
+  "lwt"
+  "cstruct" {>="1.4.0"}
+  "io-page" {>="1.4.0"}
+  "ipaddr"
+  "mirage-types" {="2.8.999"}
+]
diff --git a/repo/darwin/packages/dev/mirage-types.2.8.999/descr b/repo/darwin/packages/dev/mirage-types.2.8.999/descr
@@ -0,0 +1 @@
+Module type definitions for Mirage-compatible applications
diff --git a/repo/darwin/packages/dev/mirage-types.2.8.999/opam b/repo/darwin/packages/dev/mirage-types.2.8.999/opam
@@ -0,0 +1,20 @@
+opam-version: "1.2"
+maintainer:   ["anil@recoil.org" "thomas@gazagnaire.org"]
+authors:      "The MirageOS team"
+homepage:     "https://github.com/mirage/mirage"
+bug-reports:  "https://github.com/mirage/mirage/issues/"
+dev-repo:     "https://github.com/mirage/mirage.git"
+tags:         ["org:mirage" "org:xapi-project"]
+
+build:   [make "build-types"]
+install: [make "install-types"]
+remove:  ["ocamlfind" "remove" "mirage-types"]
+
+depends: [
+  "ocamlfind"
+  "ocamlbuild" {build}
+]
+depopts:   ["lwt" "cstruct" "io-page" "ipaddr"]
+conflicts: ["ipaddr" {< "2.0.0"}]
+
+available: [ocaml-version >= "4.01.0"]
diff --git a/repo/darwin/packages/dev/mirage-types.2.8.999/url b/repo/darwin/packages/dev/mirage-types.2.8.999/url
@@ -0,0 +1 @@
+git: "git://github.com/djs55/mirage#2.8.0-mtu"
diff --git a/repo/darwin/packages/dev/tcpip.999/url b/repo/darwin/packages/dev/tcpip.999/url
@@ -1 +1 @@
-git: "git://github.com/djs55/mirage-tcpip#3.0.0-beta10"
+git: "git://github.com/djs55/mirage-tcpip#3.0.0-beta11"
diff --git a/repo/darwin/packages/local/slirp.local/opam b/repo/darwin/packages/local/slirp.local/opam
@@ -41,7 +41,7 @@ depends: [
   "fmt"
   "astring"
   "mirage-flow" { >= "1.1.0" }
-  "mirage-types-lwt" { >= "2.8.0" & <"3.0.0" }
+  "mirage-types-lwt" { = "2.8.999" }
   "ounit"
   "alcotest"
 ]
diff --git a/repo/win32/packages/dev/mirage-types-lwt.2.8.999 b/repo/win32/packages/dev/mirage-types-lwt.2.8.999
@@ -0,0 +1 @@
+../../../darwin/packages/dev/mirage-types-lwt.2.8.999
diff --git a/repo/win32/packages/dev/mirage-types.2.8.999 b/repo/win32/packages/dev/mirage-types.2.8.999
@@ -0,0 +1 @@
+../../../darwin/packages/dev/mirage-types.2.8.999/