From 585b0d98f86cb2062b0aa6932af1708acbeddd9e Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 16 Jun 2017 14:41:32 +0100 Subject: [PATCH 1/3] xen: blkfront needs io-page-xen Previously it would benefit from these bindings being automatically linked via mirage-xen. Related to mirage/mirage#836 Signed-off-by: David Scott --- lib/jbuild | 2 +- mirage-block-xen.opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jbuild b/lib/jbuild index 8c69751..c6ef459 100644 --- a/lib/jbuild +++ b/lib/jbuild @@ -11,7 +11,7 @@ ((name mirage_block_xen_front) (public_name mirage-block-xen.front) (modules (Blkfront Block)) - (libraries (logs stringext lwt cstruct cstruct.ppx mirage-block-lwt io-page shared-memory-ring shared-memory-ring-lwt mirage-block-xen xen-evtchn xen-gnt mirage-xen)) + (libraries (logs stringext lwt cstruct cstruct.ppx mirage-block-lwt io-page io-page-xen shared-memory-ring shared-memory-ring-lwt mirage-block-xen xen-evtchn xen-gnt mirage-xen)) (wrapped false) )) diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam index c809a3e..55843dd 100644 --- a/mirage-block-xen.opam +++ b/mirage-block-xen.opam @@ -33,7 +33,7 @@ depends: [ "shared-memory-ring-lwt" "mirage-block-lwt" {>= "1.0.0"} "ipaddr" - "io-page" {>= "1.4.0"} + "io-page-xen" {>= "2.0.0"} "mirage-xen" {>= "1.0.1" } "rresult" ] From af7d9c1c4b8bdb3f7c521d9f4e700c442564fff9 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 16 Jun 2017 16:26:13 +0100 Subject: [PATCH 2/3] Add modern Docker-based travis Signed-off-by: David Scott --- .travis.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a5ae6e..672f92a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ language: c -install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh -script: bash -ex .travis-opam.sh +sudo: false +services: + - docker +install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh +script: bash -ex ./.travis-docker.sh env: global: - - PACKAGE="mirage-block-xen" - - PINS="mirage-xen" + - PACKAGE="mirage-block-xen" matrix: - - OCAML_VERSION=4.04 - - OCAML_VERSION=4.03 + - DISTRO="ubuntu-16.04" OCAML_VERSION="4.03.0" + - DISTRO="alpine-3.5" OCAML_VERSION="4.04.0" From 08e4cf64d2a4eff8b1de54b90a9962874605456f Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 16 Jun 2017 16:28:37 +0100 Subject: [PATCH 3/3] Prepare to release 1.5.3 Signed-off-by: David Scott --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ecc1256..4c24d84 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,6 @@ +## 1.5.3 (2016-06-16): +* Add missing dependency on io-page-xen + ## 1.5.2 (2017-06-11): * Add missing dependency on xenstore.client