X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=2961971ffb4e77eb3e31f2c798099500189c4495;hb=63839acb139d5381ee4615a7f467db9521e4305a;hp=02c96114cac2854ca4db2ae8b9a084ed7e49be8e;hpb=939a1a4cbf210d3d8dc7728d5a77beef0dbf670d;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 02c9611..2961971 100644
--- a/Goalfile
+++ b/Goalfile
@@ -3,15 +3,15 @@
 let fedora-dir = "%HOME/d/fedora"
 
 let branch = "master"
-let side-tag = "f32-ocaml"
-#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 side-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"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let rebuild-name = "OCaml 4.09.0 for riscv64"
+let rebuild-name = "OCaml 4.10.0+beta1 rebuild."
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -43,9 +43,10 @@ let ignored = [ "ocaml-srpm-macros", "ocaml",
 let other-packages = [
     "alt-ergo", "apron", "brltty", "coccinelle", "coq",
     "frama-c", "gappalib-coq", "graphviz", "hevea", "hivex",
-    "libguestfs", "opam", "plplot", "virt-top", "virt-v2v",
-    "why3", "z3",
-    "flocq" # no OCaml code, but needs to be rebuilt after Coq
+    "libguestfs", "libnbd", "nbdkit", "opam", "plplot",
+    "virt-top", "virt-v2v", "why3", "z3",
+    # no OCaml code, but needs to be rebuilt after Coq
+    "flocq"
 ]
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
@@ -53,13 +54,13 @@ pure function get-source-packages () returning strings = {
         [ -f $f/%branch/$f.spec ] && echo "$f"
     done
 }
-let source-packages = wrap ("*built-in-koji", get-source-packages ())
+let source-packages = wrap ("*koji-built", get-source-packages ())
 
 # Main goal: Rebuild all packages.
 goal all = : source-packages ;
 
 # Check if the source package has been built in Koji.
-tactic *built-in-koji (pkg) = {
+tactic *koji-built (pkg) = {
     cd %fedora-dir/%pkg/%branch
     koji=%koji
     specfile=%pkg.spec
@@ -105,7 +106,7 @@ tactic *built-in-koji (pkg) = {
 }
 
 goal rebuild (pkg) =
-*built-in-koji ("%pkg") : wrap ("*built-in-koji", source-dependencies (pkg)) {
+*koji-built ("%pkg") : wrap ("*koji-built", source-dependencies (pkg)) {
     cd %fedora-dir/%pkg/%branch
     fedpkg=%fedpkg
     koji=%koji