X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=ea70faa52b39f6f1426cf9bc44c8044e42596d3e;hb=20b7b98542effa33252514f8560c1f4eed40438c;hp=c5d4e92c30321f7b4169348551bfa5818975469c;hpb=ee61bd0259361d2ec169848666813d23d43b2331;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index c5d4e92..ea70faa 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 = "f32-build-side-18015"
-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+beta1 rebuild."
+let fedora-rebuild-name = "OCaml 4.10.0 final (Fedora 32)."
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -24,47 +21,30 @@ let fedora-rebuild-name = "OCaml 4.10.0+beta1 rebuild."
 # they have been rebuilt.
 let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1792769
-    "ocaml-base", "ocaml-parsexp", "ocaml-sexplib", "ocaml-odoc",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1792780
-    "ocaml-lwt", "ocaml-curl", "ocaml-lambda-term",
-    "ocaml-lwt-log", "ocaml-markup", "utop", "ocaml-tyxml",
 ]
 
 # All OCaml-related source package names
 let other-packages = [
-    "alt-ergo", "apron", "brltty",
-    "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd",
+    "alt-ergo", "apron", "brltty", "coccinelle",
+    "graphviz", "haxe", "hevea", "hivex",
+    "laby", "libguestfs", "libnbd", "opam",
     "virt-top", "virt-v2v",
+    "z3",
 
-    # no OCaml code, but needs to be rebuilt after Coq
-    #"flocq"
+    # For Coq:
+    "coq", "frama-c",
+    "why3", "zenon",
+    "flocq",
 
-    # Coq problems:
-    # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/6I2CB4KNAZXH6TKX5WQZJ3ZQGBIOCNJK/
-    # "coq", "frama-c", "gappalib-coq",
-    # "why3", "zenon",
-    # "flocq",
-
-    # causes stack overflow in goals expr_to_shell_string
-    # when handling EList.  Is the list returned too long?
+    # 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",
 
-    # plplot FTBFS for unrelated reasons
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1797853
     # "plplot",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1792740
-    # "z3",
-
-    # Coccinelle uses -unsafe-string.
-    # "coccinelle",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1792770
-    # "opam",
 ]
+
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
     for f in ocaml* %other-packages; do
@@ -74,4 +54,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)