Allow packages to be "blocked" or "ignored".

blocked -> The package, and any package which depends on it, is
not rebuilt.

ignored -> The package is treated as if it has been rebuilt.

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 19644bd..09b74f2 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -19,23 +19,59 @@ let rebuild_name = "OCaml 4.02.0 beta"
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
 
+(* Packages that have problems.  These block the packages and all
+ * dependent packages.
+ *)
 let blocked = [
-  "ocaml-lwt"; "ocaml-react"; (* loganjerry is handling *)
+  "ocaml-bitstring";               (* needs upstream fix for 4.02.0 *)
+
+  (* ocaml-labltk needs to be packaged.  Unfortunately because there
+   * is no spec file, ocaml-labltk doesn't appear in the list of
+   * source packages, and so is filtered out of all the dependency
+   * checks as if it were a non-OCaml package.  Therefore we currently
+   * also have to list all packages that depend on it.
+   *)
+  "ocaml-labltk"; (* BRed by: *) "ocaml-lablgl"; "ocaml-ocamlnet"; "planets";
 ]
+let blocked pkg = List.mem pkg blocked
+
+(* These packages are treated as if they have been rebuilt. *)
+let ignored = [
+  "ocaml-srpm-macros";             (* don't need to build this *)
+  "ocaml";                         (* rebuilt by hand *)
+  "ocaml-findlib";                 (* rebuilt by hand *)
+  "ocaml-lwt"; "ocaml-react";      (* loganjerry is handling *)
+  "whenjobs";                      (* obsolete *)
+]
+let ignored pkg = List.mem pkg ignored
 
 (* List of OCaml-related source package names. *)
 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"; "hivex";
-           "js-of-ocaml"; "llvm"; "plplot"; "whenjobs"; "why3"; "xen" ]
-
-let source_packages =
-  List.filter (fun pkg -> not (List.mem pkg blocked)) source_packages
+           "js-of-ocaml"; "llvm"; "plplot"; "why3"; "xen" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages
 
+(* Remove blocked packages and packages which have a blocked package
+ * as a dependency (recursively).
+ *)
+let source_packages =
+  let rec is_blocked pkg =
+    if blocked pkg then true
+    else (
+      let deps = List.assoc pkg pkg_deps in
+      List.exists is_blocked deps
+    )
+  in
+  List.filter (fun pkg -> not (is_blocked pkg)) source_packages
+
+let () =
+  printf "final list of source packages = %s\n%!"
+    (String.concat " " source_packages)
+
 (* Goal: rebuild all packages. *)
 let rec goal all () =
   List.iter (fun pkg -> require (rebuild_started pkg)) source_packages
@@ -52,33 +88,38 @@ and rebuilt pkg =
    * could exist as a koji build without it having been part of the
    * rebuild.
    *)
-  target (file_contains_string specfile rebuild_name &&
-          koji_build_state (fedora_verrel pkg branch) == `Complete);
-
-  (* Start the rebuild. *)
-  require (rebuild_started pkg);
-
-  (* Wait for the build state to reach a conclusion. *)
-  let rec loop () =
-    match koji_build_state (fedora_verrel pkg branch) with
-    | `No_such_build ->
-      failwith (sprintf "rebuild of package %s: no build found" pkg)
-    | `Building ->
-      sleep 60;
-      loop ()
-    | `Complete ->
-      ()
-    | `Deleted ->
-      failwith (sprintf "rebuild of package %s: deleted" pkg)
-    | `Failed ->
-      failwith (sprintf "rebuild of package %s: failed" pkg)
-    | `Canceled ->
-      failwith (sprintf "rebuild of package %s: canceled" pkg)
-  in
-  loop ();
-
-  (* Wait for the build to appear in Koji repo. *)
-  koji_wait_repo koji_target (fedora_verrel pkg branch)
+  target (ignored pkg ||
+            (file_contains_string specfile rebuild_name &&
+               koji_build_state (fedora_verrel pkg branch) == `Complete));
+
+  (* Ignored packages are treated as if they have been rebuilt. *)
+  if not (ignored pkg) then (
+
+    (* Start the rebuild. *)
+    require (rebuild_started pkg);
+
+    (* Wait for the build state to reach a conclusion. *)
+    let rec loop () =
+      match koji_build_state (fedora_verrel pkg branch) with
+      | `No_such_build ->
+        failwith (sprintf "rebuild of package %s: no build found" pkg)
+      | `Building ->
+        sleep 60;
+        loop ()
+      | `Complete ->
+        ()
+      | `Deleted ->
+        failwith (sprintf "rebuild of package %s: deleted" pkg)
+      | `Failed ->
+        failwith (sprintf "rebuild of package %s: failed" pkg)
+      | `Canceled ->
+        failwith (sprintf "rebuild of package %s: canceled" pkg)
+    in
+    loop ();
+
+    (* Wait for the build to appear in Koji repo. *)
+    koji_wait_repo koji_target (fedora_verrel pkg branch)
+  )
 
 (* Goal: The rebuild of the package has started, but we haven't waited
  * for it to finish.
@@ -91,41 +132,45 @@ and rebuild_started pkg =
    * could exist as a koji build without it having been part of the
    * rebuild.
    *)
-  target (file_contains_string specfile rebuild_name &&
-            (match koji_build_state (fedora_verrel pkg branch) with
-            | `Building | `Complete -> true
-            | `Deleted | `Failed | `Canceled | `No_such_build -> false));
+  target (ignored pkg ||
+            (file_contains_string specfile rebuild_name &&
+               (match koji_build_state (fedora_verrel pkg branch) with
+               | `Building | `Complete -> true
+               | `Deleted | `Failed | `Canceled | `No_such_build -> false)));
 
   (* All dependent packages must have been fully rebuilt and in the
    * repo first.
    *)
   List.iter (fun dep -> require (rebuilt dep)) deps;
 
-  (* A local test build must succeed. *)
-  require (local_build_succeeded pkg);
-
-  (* Rebuild the package in Koji.  Don't wait ... *)
-  koji_build ~wait:false pkg branch;
-
-  (* ... but the build doesn't appear in Koji (eg. in 'koji
-   * buildinfo') until the SRPM has been built.  This can take quite
-   * some time.  Loop here until the build appears.
-   *)
-  let rec loop () =
-    match koji_build_state (fedora_verrel pkg branch) with
-    | `No_such_build ->
-      sleep 60;
-      loop ();
-    | `Building | `Complete ->
-      ()
-    | `Deleted ->
-      failwith (sprintf "rebuild of package %s: deleted" pkg)
-    | `Failed ->
-      failwith (sprintf "rebuild of package %s: failed" pkg)
-    | `Canceled ->
-      failwith (sprintf "rebuild of package %s: canceled" pkg)
-  in
-  loop ()
+  (* Ignored packages are treated as if they have been rebuilt. *)
+  if not (ignored pkg) then (
+    (* A local test build must succeed. *)
+    require (local_build_succeeded pkg);
+
+    (* Rebuild the package in Koji.  Don't wait ... *)
+    koji_build ~wait:false pkg branch;
+
+    (* ... but the build doesn't appear in Koji (eg. in 'koji
+     * buildinfo') until the SRPM has been built.  This can take quite
+     * some time.  Loop here until the build appears.
+     *)
+    let rec loop () =
+      match koji_build_state (fedora_verrel pkg branch) with
+      | `No_such_build ->
+        sleep 60;
+        loop ();
+      | `Building | `Complete ->
+        ()
+      | `Deleted ->
+        failwith (sprintf "rebuild of package %s: deleted" pkg)
+      | `Failed ->
+        failwith (sprintf "rebuild of package %s: failed" pkg)
+      | `Canceled ->
+        failwith (sprintf "rebuild of package %s: canceled" pkg)
+    in
+    loop ()
+  )
 
 and local_build_succeeded pkg =
   (* The specfile must have been updated. *)