From e049819feae6f2ec42b63a7f58eb524ff75e3e5e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 26 Feb 2020 13:57:54 +0000
Subject: [PATCH] Remove nbdkit, built by hand.

Breaks a cycle libnbd <-> nbdkit.
---
 Goalfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Goalfile b/Goalfile
index 86e7992..3bd6c85 100644
--- a/Goalfile
+++ b/Goalfile
@@ -26,7 +26,7 @@ let fedora-ignored = [
 let other-packages = [
     "alt-ergo", "apron", "brltty",
     "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd", "nbdkit",
+    "libguestfs", "libnbd",
     "opam",
     "plplot",
     "virt-top", "virt-v2v",
@@ -43,7 +43,13 @@ let other-packages = [
 
     # Coccinelle uses -unsafe-string.
     # "coccinelle",
+
+    # Causes a cyclic dependency between libnbd <-> nbdkit.  We need
+    # to fix this in goals itself, but in the meantime disable nbdkit
+    # and build it by hand.
+    # "nbdkit",
 ]
+
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
     for f in ocaml* %other-packages; do
-- 
1.8.3.1