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
ocaml: Remove llvm.
[goaljobs-goals.git]
/
fedora_ocaml_rebuild.ml
diff --git
a/fedora_ocaml_rebuild.ml
b/fedora_ocaml_rebuild.ml
index
39e95e7
..
425a936
100644
(file)
--- a/
fedora_ocaml_rebuild.ml
+++ b/
fedora_ocaml_rebuild.ml
@@
-14,7
+14,7
@@
let koji_target = "rawhide"
(* 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.02.
0-0.8.git10e45753.fc22
"
+let rebuild_name = "ocaml-4.02.
1
"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
(* Local repository that contains build dependencies. *)
let yum_repo = "koji-rawhide"
@@
-23,9
+23,8
@@
let yum_repo = "koji-rawhide"
* dependent packages.
*)
let blocked = [
* dependent packages.
*)
let blocked = [
- "ocaml-pa-do"; (* build failure, complex *)
- "frama-c"; (* build failure *)
- "gappalib-coq"; (* build failure in configure script *)
+ "ocaml-pa-do"; (* orphaned *)
+ "plplot"; (* FTBFS, unrelated to OCaml *)
]
let blocked pkg = List.mem pkg blocked
]
let blocked pkg = List.mem pkg blocked
@@
-34,9
+33,6
@@
let ignored = [
"ocaml-srpm-macros"; (* don't need to build this *)
"ocaml"; (* rebuilt by hand *)
"whenjobs"; (* obsolete *)
"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
]
let ignored pkg = List.mem pkg ignored
@@
-45,9
+41,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";
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
";
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
"flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
- "guestfs-browser";
+ "guestfs-browser";
"libguestfs";
"virt-dmesg" ]
(* Dependencies of each package. (pkg, [deps ...]) *)
"virt-dmesg" ]
(* Dependencies of each package. (pkg, [deps ...]) *)
@@
-182,8
+178,12
@@
and rebuild_started pkg =
(* Ignored packages are treated as if they have been rebuilt. *)
if not (ignored pkg) then (
(* 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);
(* A local test build must succeed. *)
require (local_build_succeeded pkg);
+*)
+ (* local_build_succeeded normally does this ... *)
+ require (specfile_updated pkg);
(* Rebuild the package in Koji. Don't wait ... *)
koji_build ~wait:false pkg branch;
(* Rebuild the package in Koji. Don't wait ... *)
koji_build ~wait:false pkg branch;
@@
-209,6
+209,7
@@
and rebuild_started pkg =
loop ()
)
loop ()
)
+(*
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
and local_build_succeeded pkg =
(* The specfile must have been updated. *)
require (specfile_updated pkg);
@@
-227,6
+228,7
@@
and local_build_succeeded pkg =
" (fedora_repo pkg branch);
memory_set key "1"
" (fedora_repo pkg branch);
memory_set key "1"
+*)
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
and specfile_updated pkg =
let repodir = fedora_repo pkg branch in
@@
-244,7
+246,9
@@
and specfile_updated pkg =
git pull --rebase
" repodir;
git pull --rebase
" repodir;
+(* - XXX why did we do this here?
install_build_dependencies pkg;
install_build_dependencies pkg;
+*)
(* For rationale behind always bumping the spec file, see comment
* in 'fedora.ml'.
(* For rationale behind always bumping the spec file, see comment
* in 'fedora.ml'.
@@
-260,16
+264,6
@@
and specfile_updated pkg =
sh "
cd %s
sh "
cd %s
- echo 'Please make further changes as required to the spec file %s.spec'
- echo '(Press return key)'
- read
- emacs -nw %s
- echo 'OK to commit this change? (press ^C if not)'
- read
fedpkg commit -c
fedpkg commit -c
- echo 'OK to push this change? (press ^C if not)'
- read
fedpkg push
" repodir
fedpkg push
" repodir
- pkg
- specfile