X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=650f211e5f4d3b0695e5c35b44e89b160251bc2c;hb=2cec8696c1c4b14abff13b6f9a1c64be30ec8c48;hp=80229631890e5de9463f7cd5e427d6f97a24b066;hpb=8bd3d2b6a5d8e01b5e1fd6b77f0e1fb03f6027d9;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 8022963..650f211 100644
--- a/Goalfile
+++ b/Goalfile
@@ -4,16 +4,13 @@ include "fedora.gl"
 
 let fedora-dir = "%HOME/d/fedora"
 
-let fedora-branch = "master"
-let fedora-tag = "f33-build-side-19773"
-let koji = "koji"
-#let koji = "koji -p riscv64"
-let fedpkg = "fedpkg"
-#let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
+#let fedora-branch = "master"
+let fedora-branch = "f32"
+let fedora-tag = "f32-build-side-19863"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.10.0 final."
+let fedora-rebuild-name = "OCaml 4.10.0 final (Fedora 32)."
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -30,9 +27,7 @@ let fedora-ignored = [
 let other-packages = [
     "alt-ergo", "apron", "brltty",
     "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd", "nbdkit",
-    "opam",
-    "plplot",
+    "libguestfs", "libnbd",
     "virt-top", "virt-v2v",
     "z3",
 
@@ -47,7 +42,19 @@ 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",
+
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1797853
+    # "plplot",
+
+    # FTBFS because of a missing dependency.
+    # "opam",
 ]
+
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
     for f in ocaml* %other-packages; do
@@ -57,4 +64,4 @@ pure function get-source-packages () returning strings = {
 let fedora-source-packages = get-source-packages ()
 
 # Main goal: Rebuild all packages in Koji.
-goal all = : wrap ("*koji-built", fedora-source-packages)
+goal all = : wrap ("is-koji-built", fedora-source-packages)