Skip to content

Commit

Permalink
mirage-{net,bootvar,block,console}-xen, mirage-qubes{-ipv4}: adapt bo…
Browse files Browse the repository at this point in the history
…unds for the upcoming release
  • Loading branch information
hannesm committed Oct 23, 2020
1 parent f3ddaad commit 54c6eef
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/mirage_impl_argv.ml
Expand Up @@ -35,7 +35,7 @@ let argv_xen = impl @@ object
method name = "argv_xen"
method module_name = "Bootvar"
method! packages =
Key.pure [ package ~min:"0.7.0" ~max:"0.8.0" "mirage-bootvar-xen" ]
Key.pure [ package ~min:"0.8.0" ~max:"0.9.0" "mirage-bootvar-xen" ]
method! connect _ _ _ = "Bootvar.argv ()"
end

Expand Down
2 changes: 1 addition & 1 deletion lib/mirage_impl_block.ml
Expand Up @@ -26,7 +26,7 @@ let make_block_t =
b

let xen_block_packages =
[ package ~min:"1.7.0" ~max:"2.0.0" ~sublibs:["front"] "mirage-block-xen" ]
[ package ~min:"2.0.0" ~max:"3.0.0" ~sublibs:["front"] "mirage-block-xen" ]

(* this class takes a string rather than an int as `id` to allow the user to
pass stuff like "/dev/xvdi1", which mirage-block-xen also understands *)
Expand Down
4 changes: 2 additions & 2 deletions lib/mirage_impl_console.ml
Expand Up @@ -12,7 +12,7 @@ let console_unix str = impl @@ object
method name = name
method module_name = "Console_unix"
method! packages =
Key.pure [ package ~min:"3.0.0" ~max:"4.0.0" "mirage-console-unix" ]
Key.pure [ package ~min:"4.0.0" ~max:"5.0.0" "mirage-console-unix" ]
method! connect _ modname _args = Fmt.strf "%s.connect %S" modname str
end

Expand All @@ -23,7 +23,7 @@ let console_xen str = impl @@ object
method name = name
method module_name = "Console_xen"
method! packages =
Key.pure [ package ~min:"3.0.0" ~max:"4.0.0" "mirage-console-xen" ]
Key.pure [ package ~min:"4.0.0" ~max:"5.0.0" "mirage-console-xen" ]
method! connect _ modname _args = Fmt.strf "%s.connect %S" modname str
end

Expand Down
2 changes: 1 addition & 1 deletion lib/mirage_impl_ip.ml
Expand Up @@ -121,7 +121,7 @@ let ipv4_qubes_conf = impl @@ object
method name = Name.create "qubes_ipv4" ~prefix:"qubes_ipv4"
method module_name = "Qubesdb_ipv4.Make"
method! packages =
Key.pure [ package ~min:"0.8.0" ~max:"0.9.0" "mirage-qubes-ipv4" ]
Key.pure [ package ~min:"0.9.0" ~max:"0.10.0" "mirage-qubes-ipv4" ]
method! connect _ modname = function
| [ db ; _random ; _mclock ;etif; arp ] ->
Fmt.strf "%s.connect@[@ %s@ %s@ %s@]" modname db etif arp
Expand Down
4 changes: 2 additions & 2 deletions lib/mirage_impl_network.ml
Expand Up @@ -19,9 +19,9 @@ let network_conf (intf : string Key.key) =
Key.match_ Key.(value target) @@ function
| `Unix -> [ package ~min:"2.7.0" ~max:"3.0.0" "mirage-net-unix" ]
| `MacOSX -> [ package ~min:"1.8.0" ~max:"2.0.0" "mirage-net-macosx" ]
| `Xen -> [ package ~min:"1.13.0" ~max:"2.0.0" "mirage-net-xen"]
| `Xen -> [ package ~min:"2.0.0" ~max:"3.0.0" "mirage-net-xen"]
| `Qubes ->
[ package ~min:"1.13.0" ~max:"2.0.0" "mirage-net-xen" ;
[ package ~min:"2.0.0" ~max:"3.0.0" "mirage-net-xen" ;
Mirage_impl_qubesdb.pkg ]
| #Mirage_key.mode_solo5 ->
[ package ~min:"0.6.1" ~max:"0.7.0" "mirage-net-solo5" ]
Expand Down
2 changes: 1 addition & 1 deletion lib/mirage_impl_qubesdb.ml
Expand Up @@ -6,7 +6,7 @@ open Rresult
type qubesdb = QUBES_DB
let qubesdb = Type QUBES_DB

let pkg = package ~min:"0.8.0" ~max:"0.9.0" "mirage-qubes"
let pkg = package ~min:"0.9.0" ~max:"0.10.0" "mirage-qubes"

let qubesdb_conf = object
inherit base_configurable
Expand Down

0 comments on commit 54c6eef

Please sign in to comment.