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

diff --git a/Goalfile b/Goalfile
index 9dac9db..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.
@@ -22,28 +18,38 @@ let fedora-rebuild-name = "OCaml 4.10.0+beta1 rebuild."
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
-let fedora-ignored = [ "ocaml-srpm-macros", "ocaml" ]
+let fedora-ignored = [
+    "ocaml-srpm-macros", "ocaml",
+]
 
 # All OCaml-related source package names
 let other-packages = [
-    "alt-ergo", "apron", "brltty", "coccinelle",
+    "alt-ergo", "apron", "brltty",
     "graphviz", "hevea", "hivex",
-    "libguestfs", "libnbd", "opam",
-    "virt-top", "virt-v2v", "z3",
+    "libguestfs", "libnbd",
+    "opam",
+    "plplot",
+    "virt-top", "virt-v2v",
+    "z3",
 
     # no OCaml code, but needs to be rebuilt after Coq
-    # "flocq"
-
-    # "nbdkit" - causes stack overflow in goals expr_to_shell_string
-    # when handling EList.  Is the list returned too long?
+    #"flocq"
 
-    # coq + deps are broken, see:
+    # Coq problems:
     # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/6I2CB4KNAZXH6TKX5WQZJ3ZQGBIOCNJK/
-    # "coq", "flocq", "frama-c", "gappalib-coq", "why3", "zenon"
+    # "coq", "frama-c", "gappalib-coq",
+    # "why3", "zenon",
+    # "flocq",
 
-    # plplot FTBFS for unrelated reasons
-    # "plplot",
+    # 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
@@ -53,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)