X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=3bd6c8583078c81d93246388fa6c0d7d80b52cb8;hb=e049819feae6f2ec42b63a7f58eb524ff75e3e5e;hp=5c016c881abd3237d16e8da7d7f5c99f4994e44b;hpb=5b75346d83ccbbdfcb799479c559245051ae5b34;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 5c016c8..3bd6c85 100644
--- a/Goalfile
+++ b/Goalfile
@@ -5,15 +5,11 @@ 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-tag = "f33-build-side-19773"
 
 # 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."
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -30,8 +26,11 @@ let fedora-ignored = [
 let other-packages = [
     "alt-ergo", "apron", "brltty",
     "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd", "nbdkit",
+    "libguestfs", "libnbd",
+    "opam",
+    "plplot",
     "virt-top", "virt-v2v",
+    "z3",
 
     # no OCaml code, but needs to be rebuilt after Coq
     #"flocq"
@@ -42,18 +41,15 @@ let other-packages = [
     # "why3", "zenon",
     # "flocq",
 
-    # plplot FTBFS for unrelated reasons
-    # "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",
+    # 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
@@ -63,4 +59,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)