Merge pull request #963 from hannesm/release-3.4.0

changes entries for 3.4.0
mirage · Jan 11, 2019 · 98cad53 · 98cad53
2 parents 7354461 + 1960fb5
commit 98cad53
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,15 +9,16 @@ env:
  global:
    - PRE_INSTALL_HOOK="cd /home/opam/opam-repository && git pull origin master && opam update -u -y"
    - POST_INSTALL_HOOK="sh ./.travis-ci.sh"
-   - PINS="mirage:. mirage-types:. mirage-types-lwt:. mirage-runtime:."
+   - PINS="mirage.3.4.0:. mirage-types.3.4.0:. mirage-types-lwt.3.4.0:. mirage-runtime.3.4.0:."
    - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
+   - PACKAGE=mirage
  matrix:
-   - PACKAGE=mirage DISTRO=debian-testing OCAML_VERSION=4.04 EXTRA_ENV="MODE=xen"
-   - PACKAGE=mirage DISTRO=debian-testing OCAML_VERSION=4.04 EXTRA_ENV="MODE=hvt"
-   - PACKAGE=mirage DISTRO=debian-unstable OCAML_VERSION=4.04 EXTRA_ENV="MODE=unix"
-   - PACKAGE=mirage DISTRO=ubuntu-16.04 OCAML_VERSION=4.05 EXTRA_ENV="MODE=xen"
-   - PACKAGE=mirage DISTRO=ubuntu-16.04 OCAML_VERSION=4.05 EXTRA_ENV="MODE=hvt"
-   - PACKAGE=mirage DISTRO=ubuntu-16.04 OCAML_VERSION=4.05 EXTRA_ENV="MODE=virtio"
-   - PACKAGE=mirage DISTRO=debian-testing OCAML_VERSION=4.06 EXTRA_ENV="MODE=unix"
-   - PACKAGE=mirage DISTRO=debian-testing OCAML_VERSION=4.06 EXTRA_ENV="MODE=hvt"
-   - PACKAGE=mirage DISTRO=debian-testing OCAML_VERSION=4.06 EXTRA_ENV="MODE=muen"
+   - DISTRO=debian-testing OCAML_VERSION=4.04 EXTRA_ENV="MODE=xen"
+   - DISTRO=alpine OCAML_VERSION=4.04 EXTRA_ENV="MODE=hvt"
+   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.05 EXTRA_ENV="MODE=unix"
+   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.05 EXTRA_ENV="MODE=virtio"
+   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.06 EXTRA_ENV="MODE=xen"
+   - DISTRO=debian-testing OCAML_VERSION=4.06 EXTRA_ENV="MODE=muen"
+   - DISTRO=alpine OCAML_VERSION=4.07 EXTRA_ENV="MODE=unix"
+   - DISTRO=debian-testing OCAML_VERSION=4.07 EXTRA_ENV="MODE=hvt"
+   - DISTRO=alpine OCAML_VERSION=4.07 EXTRA_ENV="MODE=xen"
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,11 @@
+### v3.4.0 (2019-01-11)
+
+* use ipaddr 3.0 without s-expression dependency (#956, by @hannesm)
+* use mirage-clock 2.x and tcpip 3.6.x libraries (#960, #962, by @hannesm)
+* default to socket stack on unix and macos (#958, by @hannesm)
+* use String.split_on_char in mirage-runtime to avoid astring dependency (#957, by @hannesm)
+* add build-dependency on mirage to each unikernel (#953, by @hannesm)
+
 ### 3.3.1 (2018-11-21)
 
 * fix regression: --yes was not passed to opam in 3.3.0 (#950, by @hannesm)

diff --git a/lib/mirage.ml b/lib/mirage.ml
@@ -886,7 +886,7 @@ module Project = struct
       ]
       method! packages =
         (* XXX: use %%VERSION_NUM%% here instead of hardcoding a version? *)
-        let min = "3.3.0" and max = "3.4.0" in
+        let min = "3.4.0" and max = "3.5.0" in
         let common = [
           package ~build:true ~min:"4.04.2" "ocaml";
           package "lwt";

diff --git a/mirage-types-lwt.opam b/mirage-types-lwt.opam
@@ -18,22 +18,22 @@ depends:   [
   "ocaml" {>= "4.04.2"}
   "dune" {build & >= "1.1.0"}
   "lwt"
-  "cstruct" {>="1.4.0"}
-  "io-page" {>="1.4.0"}
-  "ipaddr"
-  "mirage-types" {>= "3.3.0"}
-  "mirage-clock-lwt" {>= "1.2.0"}
-  "mirage-time-lwt" {>= "1.0.0"}
-  "mirage-random" {>= "1.0.0"}
-  "mirage-flow-lwt" {>= "1.2.0"}
-  "mirage-protocols-lwt" {>= "1.4.0"}
+  "cstruct" {>="3.2.1"}
+  "io-page" {>="2.0.1"}
+  "ipaddr" {>= "3.0.0"}
+  "mirage-types" {>= "3.4.0"}
+  "mirage-clock-lwt" {>= "2.0.0"}
+  "mirage-time-lwt" {>= "1.1.0"}
+  "mirage-random" {>= "1.2.0"}
+  "mirage-flow-lwt" {>= "1.5.0"}
+  "mirage-protocols-lwt" {>= "1.4.1"}
   "mirage-stack-lwt" {>= "1.3.0"}
-  "mirage-console-lwt" {>= "1.2.0"}
-  "mirage-block-lwt" {>= "1.0.0"}
-  "mirage-net-lwt" {>= "1.0.0"}
-  "mirage-fs-lwt" {>= "1.0.0"}
-  "mirage-kv-lwt" {>= "1.0.0"}
-  "mirage-channel-lwt" {>= "3.0.0"}
+  "mirage-console-lwt" {>= "2.3.5"}
+  "mirage-block-lwt" {>= "1.1.0"}
+  "mirage-net-lwt" {>= "1.2.0"}
+  "mirage-fs-lwt" {>= "1.1.1"}
+  "mirage-kv-lwt" {>= "1.1.0"}
+  "mirage-channel-lwt" {>= "3.1.0"}
 ]
 
 synopsis: "Lwt module type definitions for MirageOS applications"

diff --git a/mirage-types.opam b/mirage-types.opam
@@ -19,19 +19,19 @@ build: [
 depends: [
   "ocaml" {>= "4.04.2"}
   "dune" {build & >= "1.1.0"}
-  "mirage-device" {>= "1.0.0"}
-  "mirage-time" {>= "1.0.0"}
-  "mirage-clock" {>= "1.2.0"}
-  "mirage-random" {>= "1.0.0"}
-  "mirage-flow" {>= "1.2.0"}
-  "mirage-console" {>= "2.2.0"}
-  "mirage-protocols" {>= "1.4.0"}
+  "mirage-device" {>= "1.1.0"}
+  "mirage-time" {>= "1.1.0"}
+  "mirage-clock" {>= "2.0.0"}
+  "mirage-random" {>= "1.2.0"}
+  "mirage-flow" {>= "1.5.0"}
+  "mirage-console" {>= "2.3.5"}
+  "mirage-protocols" {>= "1.4.1"}
   "mirage-stack" {>= "1.3.0"}
-  "mirage-block" {>= "1.0.0"}
-  "mirage-net" {>= "1.0.0"}
-  "mirage-fs" {>= "1.0.0"}
-  "mirage-kv" {>= "1.0.0"}
-  "mirage-channel" {>= "3.0.0"}
+  "mirage-block" {>= "1.1.0"}
+  "mirage-net" {>= "1.2.0"}
+  "mirage-fs" {>= "1.1.1"}
+  "mirage-kv" {>= "1.1.1"}
+  "mirage-channel" {>= "3.1.0"}
 ]
 synopsis: "Module type definitions for MirageOS applications"
 description: """

diff --git a/mirage.opam b/mirage.opam
@@ -24,7 +24,7 @@ depends: [
   "bos"
   "astring"
   "logs"
-  "mirage-runtime"     {>= "3.3.0"}
+  "mirage-runtime"     {>= "3.4.0"}
 ]
 synopsis: "The MirageOS library operating system"
 description: """