Update branches for libguestfs 1.32.

[goaljobs-goals.git] / fedora_ocaml_rebuild.ml

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 0d8d597..13a8c01 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -9,12 +9,17 @@ open Git
 open Fedora
 
 let branch = "master"
-let koji_target = "rawhide"
+let side_tag = Some "f24-ocaml"
+
+let koji_target =
+  match side_tag with
+  | Some t -> t
+  | None -> "rawhide"
 
 (* The name of the rebuild, and also the magic substring that must
  * appear in the %changelog when the package has been rebuilt.
  *)
-let rebuild_name = "ocaml-4.02.0+rc1"
+let rebuild_name = "OCaml 4.02.3"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -23,10 +28,8 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-pa-do";                        (* build failure, complex *)
-  "frama-c";                            (* build failure *)
-  "gappalib-coq";                       (* build failure in configure script *)
-  "ocaml-camlimages";                   (* build failure, conflicting C types in header files *)
+  "ocaml-pa-do";                        (* orphaned *)
+  "ocaml-camlp5";                       (* not updated to 4.02.3 yet *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -35,9 +38,6 @@ let ignored = [
   "ocaml-srpm-macros";             (* don't need to build this *)
   "ocaml";                         (* rebuilt by hand *)
   "whenjobs";                      (* obsolete *)
-  "libguestfs";                    (* rebuilt by hand *)
-  "graphviz";                      (* rebuilt by hand *)
-  "plplot";                        (* already done *)
 ]
 let ignored pkg = List.mem pkg ignored
 
@@ -46,9 +46,9 @@ let source_packages =
   let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
   dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
            "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
-           "js-of-ocaml"; "llvm"; "plplot"; "virt-top"; "why3"; "xen";
+           "js-of-ocaml"; "plplot"; "virt-top"; "why3"; "z3";
            "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
-           "guestfs-browser";
+           "guestfs-browser"; "libguestfs";
            "virt-dmesg" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
@@ -95,12 +95,14 @@ let () =
   printf "final list of source packages = %s\n%!"
     (String.concat " " source_packages)
 
+(*
 (* We could make this a goal, but it's cheap enough to run it unconditionally. *)
 let install_build_dependencies pkg =
   sh "sudo yum clean all --disablerepo=\\* --enablerepo=%s"
     (quote yum_repo);
   sh "sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s"
     (quote yum_repo) (fedora_specfile pkg branch)
+ *)
 
 (* Unset MAKEFLAGS so it doesn't affect local builds. *)
 let () = Unix.putenv "MAKEFLAGS" ""
@@ -191,7 +193,7 @@ and rebuild_started pkg =
     require (specfile_updated pkg);
 
     (* Rebuild the package in Koji.  Don't wait ... *)
-    koji_build ~wait:false pkg branch;
+    koji_build ~wait:false ?side_tag pkg branch;
 
     (* ... but the build doesn't appear in Koji (eg. in 'koji
      * buildinfo') until the SRPM has been built.  This can take quite