Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a734f1d674c5
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6efccb40bc19
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Jul 28, 2018

  1. prepare for release

    hannesm committed Jul 28, 2018
    Copy the full SHA
    98a9092 View commit details

Commits on Jul 29, 2018

  1. Copy the full SHA
    e5c0ae2 View commit details
  2. Copy the full SHA
    0227f45 View commit details
  3. Copy the full SHA
    72659cd View commit details

Commits on Aug 1, 2018

  1. Copy the full SHA
    30f46a8 View commit details
  2. Merge pull request #914 from hannesm/minor

    prepare for release
    hannesm authored Aug 1, 2018
    Copy the full SHA
    6efccb4 View commit details
Showing with 20 additions and 11 deletions.
  1. +9 −0 CHANGES.md
  2. +7 −7 lib/mirage.ml
  3. +1 −1 mirage-runtime.opam
  4. +1 −1 mirage-types-lwt.opam
  5. +1 −1 mirage-types.opam
  6. +1 −1 mirage.opam
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### 3.1.1 (2018-08-01)

* for the unix target, add `-tags thread`, as done for the mac osx target (#861,
suggested by @cfcs)
* bump minimum mirage-solo5* and solo5-kernel* to 0.3.0 (#914, by @hannesm, as
suggested by @mato)
* use the exposed signature in functoria for Key modules (#912, by @Drup)
* add ?group param to all generic devices (#913, by @samoht)

### 3.1.0 (2018-06-20)

* solo5 v0.3.0 support (#906, by @mato @kensan @hannesm):
14 changes: 7 additions & 7 deletions lib/mirage.ml
Original file line number Diff line number Diff line change
@@ -291,7 +291,7 @@ let console_solo5 str = impl @@ object
val name = Name.ocamlify @@ "console_solo5_" ^ str
method name = name
method module_name = "Console_solo5"
method! packages = Key.pure [ package ~min:"0.2.0" "mirage-console-solo5" ]
method! packages = Key.pure [ package ~min:"0.3.0" "mirage-console-solo5" ]
method! connect _ modname _args = Fmt.strf "%s.connect %S" modname str
end
@@ -417,7 +417,7 @@ class block_conf file =
method! packages =
Key.match_ Key.(value target) @@ function
| `Xen | `Qubes -> xen_block_packages
| `Virtio | `Ukvm | `Muen -> [ package ~min:"0.2.1" "mirage-block-solo5" ]
| `Virtio | `Ukvm | `Muen -> [ package ~min:"0.3.0" "mirage-block-solo5" ]
| `Unix | `MacOSX -> [ package ~min:"2.5.0" "mirage-block-unix" ]

method! configure _ =
@@ -605,7 +605,7 @@ let network_conf (intf : string Key.key) =
| `MacOSX -> [ package ~min:"1.3.0" "mirage-net-macosx" ]
| `Xen -> [ package ~min:"1.7.0" "mirage-net-xen"]
| `Qubes -> [ package ~min:"1.7.0" "mirage-net-xen" ; package ~min:"0.4" "mirage-qubes" ]
| `Virtio | `Ukvm | `Muen -> [ package ~min:"0.2.0" "mirage-net-solo5" ]
| `Virtio | `Ukvm | `Muen -> [ package ~min:"0.3.0" "mirage-net-solo5" ]
method! connect _ modname _ =
Fmt.strf "%s.connect %a" modname Key.serialize_call key
method! configure i =
@@ -1317,7 +1317,7 @@ let argv_solo5 = impl @@ object
method ty = Functoria_app.argv
method name = "argv_solo5"
method module_name = "Bootvar"
method! packages = Key.pure [ package ~min:"0.2.0" "mirage-bootvar-solo5" ]
method! packages = Key.pure [ package ~min:"0.3.0" "mirage-bootvar-solo5" ]
method! connect _ _ _ = "Bootvar.argv ()"
end

@@ -1860,7 +1860,7 @@ let compile libs warn_error target =
"principal";
"safe_string" ] @
(if warn_error then ["warn_error(+1..49)"] else []) @
(match target with `MacOSX -> ["thread"] | _ -> []) @
(match target with `MacOSX | `Unix -> ["thread"] | _ -> []) @
(if terminal () then ["color(always)"] else [])
and result = match target with
| `Unix | `MacOSX -> "main.native"
@@ -2108,8 +2108,8 @@ module Project = struct
| `Xen | `Qubes -> [ package ~min:"3.0.4" "mirage-xen" ] @ common
| `Virtio | `Ukvm | `Muen as tgt ->
let pkg, _ = solo5_pkg tgt in
[ package ~min:"0.2.1" ~ocamlfind:[] pkg ;
package ~min:"0.2.0" "mirage-solo5" ] @ common
[ package ~min:"0.3.0" ~ocamlfind:[] pkg ;
package ~min:"0.3.0" "mirage-solo5" ] @ common

method! build = build
method! configure = configure
2 changes: 1 addition & 1 deletion mirage-runtime.opam
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ tags: ["org:mirage" "org:xapi-project"]
doc: "https://mirage.github.io/mirage/"

build: [
["jbuilder" "subst"]{pinned}
["jbuilder" "subst" "-p" name]{pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]

2 changes: 1 addition & 1 deletion mirage-types-lwt.opam
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ tags: ["org:mirage" "org:xapi-project"]


build: [
["jbuilder" "subst"]{pinned}
["jbuilder" "subst" "-p" name]{pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]

2 changes: 1 addition & 1 deletion mirage-types.opam
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ tags: ["org:mirage" "org:xapi-project"]


build: [
["jbuilder" "subst"]{pinned}
["jbuilder" "subst" "-p" name]{pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]

2 changes: 1 addition & 1 deletion mirage.opam
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ tags: ["org:mirage" "org:xapi-project"]
doc: "https://mirage.github.io/mirage/"

build: [
["jbuilder" "subst"]{pinned}
["jbuilder" "subst" "-p" name]{pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]