Merge pull request #48 from gaborigloi/fix_build

Fix build and make new release
mirage · Dec 11, 2017 · 5faddb3 · 5faddb3
2 parents 3b5cf2c + 1149dcd
commit 5faddb3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,12 +6,14 @@ services:
 sudo: false
 env:
  global:
-   - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
-   - PACKAGE="vhd-format"
    - PINS="vhd-format:. vhd-format-lwt:."
  matrix:
-   - DISTRO=debian-stable OCAML_VERSION=4.04.2
-   - DISTRO=ubuntu-16.04 OCAML_VERSION=4.03.0
-   - DISTRO=centos-7 OCAML_VERSION=4.04.2
-   - DISTRO=fedora-24 OCAML_VERSION=4.04.2
-   - DISTRO=alpine OCAML_VERSION=4.03.0
+   - PACKAGE=vhd-format DISTRO=debian-stable OCAML_VERSION=4.04.2
+   - PACKAGE=vhd-format-lwt DISTRO=ubuntu-16.04 OCAML_VERSION=4.03.0
+   - PACKAGE=vhd-format-lwt DISTRO=debian-stable OCAML_VERSION=4.04.2
+   - PACKAGE=vhd-format-lwt DISTRO=centos-7 OCAML_VERSION=4.05.0
+   - PACKAGE=vhd-format-lwt DISTRO=alpine OCAML_VERSION=4.06.0
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: PACKAGE=vhd-format-lwt DISTRO=alpine OCAML_VERSION=4.06.0
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+0.9.1 (2017-12-11)
+* Fix build of vhd-format-lwt package
+
 0.9.0 (2017-12-08)
 * Update to Mirage 3
 * Port to jbuilder

diff --git a/vhd-format-lwt.opam b/vhd-format-lwt.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/mirage/ocaml-vhd"
 bug-reports: "https://github.com/mirage/ocaml-vhd/issues"
 dev-repo: "git://github.com/mirage/ocaml-vhd"
 build: [[ "jbuilder" "build" "-p" name "-j" jobs ]]
-build-test: [[ "jbuilder" "runtest" ]]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
   "cstruct"
   "lwt" {>= "2.4.3"}

diff --git a/vhd_format_lwt/jbuild b/vhd_format_lwt/jbuild
@@ -9,7 +9,7 @@
     mirage-block
     mirage-types-lwt
     oUnit
-    vhd_format))
+    vhd-format))
   (c_names (blkgetsize64_stubs lseek64_stubs odirect_stubs))
  )
 )
diff --git a/vhd_format_lwt/patterns_lwt.ml b/vhd_format_lwt/patterns_lwt.ml
@@ -46,7 +46,7 @@ let fill_sector_with pattern =
   done;
   b
 
-let absolute_sector_of vhd Vhd_format.Patterns.{ block; sector } =
+let absolute_sector_of vhd position { Vhd_format.Patterns.block; sector } =
   let open F in
   if vhd.Vhd.header.Header.max_table_entries = 0
   then None

diff --git a/vhd_format_lwt_test/jbuild b/vhd_format_lwt_test/jbuild
@@ -7,7 +7,7 @@
       lwt
       lwt.unix
       oUnit
-      vhd_format
+      vhd-format
       vhd_format_lwt))
    (preprocess (pps (lwt.ppx)))))