Merge pull request #19754 from samoht/relax-bounds-mirage4

Relax bounds to prepare MirageOS 4
ocaml · Oct 13, 2021 · baa76db · baa76db
2 parents 3606210 + 347eda4
commit baa76db
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/packages/mirage-block-solo5/mirage-block-solo5.0.6.1/opam b/packages/mirage-block-solo5/mirage-block-solo5.0.6.1/opam
@@ -22,7 +22,7 @@ depends: [
   "lwt" {>= "2.4.3"}
   "cstruct" {>= "1.0.1"}
   "mirage-block" {>= "2.0.0"}
-  "mirage-solo5" {>= "0.6.0" & < "0.7.0"}
+  "mirage-solo5" {>= "0.6.0" & < "0.8.0"}
   "fmt"
 ]
 synopsis: "Solo5 implementation of MirageOS block interface"

diff --git a/packages/mirage-block-unix/mirage-block-unix.2.12.1/opam b/packages/mirage-block-unix/mirage-block-unix.2.12.1/opam
@@ -14,12 +14,13 @@ depends: [
   "cstruct-lwt"
   "mirage-block" {>= "2.0.0"}
   "rresult"
-  "io-page-unix" {>= "2.0.0"}
+  "io-page" {>= "2.0.0"}
   "uri" {>= "1.9.0"}
   "logs"
   "ounit" {with-test}
   "diet" {with-test & >= "0.4"}
   "fmt" {with-test}
+  "io-page-unix" {with-test}
   "conf-linux-libc-dev" {os = "linux"}
 ]
 build: [

diff --git a/packages/mirage-bootvar-solo5/mirage-bootvar-solo5.0.6.0/opam b/packages/mirage-bootvar-solo5/mirage-bootvar-solo5.0.6.0/opam
@@ -20,7 +20,7 @@ build: [
 depends: [
   "ocaml" {>= "4.04.2"}
   "dune" {>= "1.0"}
-  "mirage-solo5" {>= "0.6.0" & < "0.7.0"}
+  "mirage-solo5" {>= "0.6.0" & < "0.8.0"}
   "lwt"
   "parse-argv"
 ]

diff --git a/packages/mirage-console-solo5/mirage-console-solo5.0.6.1/opam b/packages/mirage-console-solo5/mirage-console-solo5.0.6.1/opam
@@ -22,7 +22,7 @@ depends: [
   "ocaml" {>= "4.06.0"}
   "dune" {>= "1.0"}
   "mirage-console" {>= "3.0.0"}
-  "mirage-solo5" {>= "0.6.0" & < "0.7.0"}
+  "mirage-solo5" {>= "0.6.0" & < "0.8.0"}
   "cstruct"
   "lwt"
 ]

diff --git a/packages/mirage-crypto-pk/mirage-crypto-pk.0.10.3/opam b/packages/mirage-crypto-pk/mirage-crypto-pk.0.10.3/opam
@@ -11,7 +11,7 @@ synopsis:     "Simple public-key cryptography for the modern age"
 build: [ ["dune" "subst"] {dev}
          ["dune" "build" "-p" name "-j" jobs ]
          ["dune" "runtest" "-p" name "-j" jobs] {with-test} ]
-
+available: [ arch != "arm32"]
 depends: [
   "conf-gmp-powm-sec" {build}
   "ocaml" {>= "4.08.0"}
@@ -26,7 +26,7 @@ depends: [
   "zarith" {>= "1.4"}
   "eqaf" {>= "0.7"}
   "rresult" {>= "0.6.0"}
-  (("mirage-no-solo5" & "mirage-no-xen") | "zarith-freestanding")
+  (("mirage-no-solo5" & "mirage-no-xen") | "zarith-freestanding" | "mirage" {>= "4.0.0"})
 ]
 conflicts: [
   "mirage-xen" {< "6.0.0"}

diff --git a/packages/mirage-net-solo5/mirage-net-solo5.0.6.2/opam b/packages/mirage-net-solo5/mirage-net-solo5.0.6.2/opam
@@ -25,7 +25,7 @@ depends: [
   "lwt" {>= "2.4.3"}
   "mirage-net" {>= "3.0.0"}
   "macaddr" { >= "4.0.0"}
-  "mirage-solo5" {>= "0.6.0" & < "0.7.0"}
+  "mirage-solo5" {>= "0.6.0" & < "0.8.0"}
   "logs" {>= "0.6.0"}
   "metrics"
   "fmt"