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
Block coq while jjames looks at it.
[goaljobs-goals.git]
/
fedora_ocaml_rebuild.ml
diff --git
a/fedora_ocaml_rebuild.ml
b/fedora_ocaml_rebuild.ml
index
fb87b64
..
1b0022a
100644
(file)
--- a/
fedora_ocaml_rebuild.ml
+++ b/
fedora_ocaml_rebuild.ml
@@
-9,18
+9,18
@@
open Git
open Fedora
let branch = "master"
open Fedora
let branch = "master"
-(*let side_tag = Some "f
27
-ocaml"*)
+(*let side_tag = Some "f
31
-ocaml"*)
let side_tag = None
let koji_target =
match side_tag with
| Some t -> t
let side_tag = None
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
4.2
"
+let rebuild_name = "OCaml 4.0
8.1 (rc2)
"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
@@
-29,7
+29,10
@@
let yum_repo = "koji-rawhide"
* dependent packages.
*)
let blocked = [
* dependent packages.
*)
let blocked = [
- "brltty"; (* broken for non-OCaml reasons *)
+ "ocaml-camlp4"; (* deprecated + all dependent packages *)
+ "ocaml-yojson"; (* jjames is looking at this *)
+ "ocaml-dose3"; (* requires ocaml-seq, see 1735476 & 1735629 *)
+ "coq"; (* jjames is looking at this, see RHBZ#1735619 *)
]
let blocked pkg = List.mem pkg blocked
]
let blocked pkg = List.mem pkg blocked
@@
-50,7
+53,7
@@
let source_packages =
" fedora_dir in
dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
"cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
" fedora_dir in
dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
"cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
- "plplot"; "virt-top"; "why3"; "z3";
+ "
opam"; "
plplot"; "virt-top"; "why3"; "z3";
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
"guestfs-browser"; "libguestfs" ]
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
"guestfs-browser"; "libguestfs" ]