From cf6d97c1f48a73baeedc57136028191db36d892f Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Wed, 21 Oct 2020 20:52:52 +0200
Subject: [PATCH] sync dependencies between opam and dune files changes for
 2.0.0

---
 CHANGES.md            | 3 +++
 lib/back/dune         | 2 +-
 lib/front/blkfront.ml | 2 +-
 lib/front/dune        | 2 +-
 mirage-block-xen.opam | 6 ++----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 31edf50..e8a6f3a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+## v2.0.0 (2020-10-21)
+* Adapt to mirage-xen 6.0.0 API changes (Solo5 based Xen PVH, #87 @mato)
+
 ## v1.7.0 (2019-11-01)
 * Adapt to mirage-xen 5.0.0 API changes (#86 @hannesm)
 * Adapt to mriage-block 2.0.0 API changs (#86 @hannesm)
diff --git a/lib/back/dune b/lib/back/dune
index 1174e6a..3c7e88d 100644
--- a/lib/back/dune
+++ b/lib/back/dune
@@ -5,5 +5,5 @@
  (flags :standard -w -3)
  (libraries logs lwt cstruct io-page shared-memory-ring
    shared-memory-ring-lwt mirage-block-xen xenstore
-   xenstore.client mirage-block rresult mirage-xen)
+   xenstore.client mirage-block mirage-xen)
  (wrapped false))
diff --git a/lib/front/blkfront.ml b/lib/front/blkfront.ml
index 69e4771..d689de0 100644
--- a/lib/front/blkfront.ml
+++ b/lib/front/blkfront.ml
@@ -195,7 +195,7 @@ let enumerate () =
 let deprecated_prefixes = [ "tapdisk"; "tap2"; "aio"; "ioemu"; "file"; "phy" ]
 
 let strip_prefixes x =
-  Stringext.split x ~on:':'
+  String.split_on_char ':' x
   |> List.fold_left (fun acc x -> match acc with
       | [] ->
         if List.mem x deprecated_prefixes
diff --git a/lib/front/dune b/lib/front/dune
index bebf0a6..d85e6ff 100644
--- a/lib/front/dune
+++ b/lib/front/dune
@@ -2,7 +2,7 @@
  (name mirage_block_xen_front)
  (public_name mirage-block-xen.front)
  (modules Blkfront Block)
- (libraries logs stringext lwt cstruct mirage-block io-page
+ (libraries logs lwt cstruct mirage-block io-page
    shared-memory-ring shared-memory-ring-lwt mirage-block-xen
    mirage-xen)
  (wrapped false))
diff --git a/mirage-block-xen.opam b/mirage-block-xen.opam
index 80eb376..4648a8a 100644
--- a/mirage-block-xen.opam
+++ b/mirage-block-xen.opam
@@ -9,18 +9,16 @@ bug-reports: "https://github.com/mirage/mirage-block-xen/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
   "dune"
-  "cmdliner"
   "logs"
-  "stringext"
   "lwt" {>= "2.4.3"}
   "cstruct" {>= "1.9.0"}
   "ppx_cstruct" {build & >= "3.6.0"}
+  "shared-memory-ring"
   "shared-memory-ring-lwt"
   "mirage-block" {>= "2.0.0"}
-  "ipaddr"
   "io-page" {>= "2.0.0"}
   "mirage-xen" {>= "6.0.0"}
-  "rresult"
+  "xenstore"
 ]
 build: [
   ["dune" "subst"] {pinned}