git.annexia.org
/
goaljobs-goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add opam to the package build list.
[goaljobs-goals.git]
/
fedora_ocaml_rebuild.ml
diff --git
a/fedora_ocaml_rebuild.ml
b/fedora_ocaml_rebuild.ml
index
13a8c01
..
a5645f1
100644
(file)
--- a/
fedora_ocaml_rebuild.ml
+++ b/
fedora_ocaml_rebuild.ml
@@
-9,17
+9,18
@@
open Git
open Fedora
let branch = "master"
open Fedora
let branch = "master"
-let side_tag = Some "f24-ocaml"
+let side_tag = Some "f31-ocaml"
+(*let side_tag = None*)
let koji_target =
match side_tag with
| Some t -> t
let koji_target =
match side_tag with
| Some t -> t
- | None -> "
rawhide
"
+ | None -> "
f31-build
"
(* The name of the rebuild, and also the magic substring that must
* appear in the %changelog when the package has been rebuilt.
*)
(* 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.0
2.3
"
+let rebuild_name = "OCaml 4.0
8.0 (beta 3)
"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
@@
-28,8
+29,9
@@
let yum_repo = "koji-rawhide"
* dependent packages.
*)
let blocked = [
* dependent packages.
*)
let blocked = [
- "ocaml-pa-do"; (* orphaned *)
- "ocaml-camlp5"; (* not updated to 4.02.3 yet *)
+ "ocaml-camlp4"; (* not ported to 4.08 yet *)
+ "ocaml-camlp5"; (* not ported to 4.08 yet *)
+ "ocaml-zarith"; (* build failures, seemingly unrelated *)
]
let blocked pkg = List.mem pkg blocked
]
let blocked pkg = List.mem pkg blocked
@@
-37,19
+39,22
@@
let blocked pkg = List.mem pkg blocked
let ignored = [
"ocaml-srpm-macros"; (* don't need to build this *)
"ocaml"; (* rebuilt by hand *)
let ignored = [
"ocaml-srpm-macros"; (* don't need to build this *)
"ocaml"; (* rebuilt by hand *)
- "whenjobs"; (* obsolete *)
]
let ignored pkg = List.mem pkg ignored
(* List of OCaml-related source package names. *)
let source_packages =
]
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
+ let dirs = shlines "
+ cd %s && \
+ for f in ocaml*; do
+ [ -f \"$f/master/$f.spec\" ] && echo \"$f\"
+ done
+ " fedora_dir in
dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
"cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
"cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
- "
js-of-ocaml
"; "plplot"; "virt-top"; "why3"; "z3";
+ "
opam
"; "plplot"; "virt-top"; "why3"; "z3";
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
- "guestfs-browser"; "libguestfs";
- "virt-dmesg" ]
+ "guestfs-browser"; "libguestfs" ]
(* Dependencies of each package. (pkg, [deps ...]) *)
let pkg_deps = dependencies branch source_packages
(* Dependencies of each package. (pkg, [deps ...]) *)
let pkg_deps = dependencies branch source_packages