From: Richard W.M. Jones Date: Mon, 21 Jul 2014 10:18:25 +0000 (+0100) Subject: Always pull packages from a named local repo. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=c864227ae124df1cda56034f022f985b1a512b82;p=goaljobs-goals.git Always pull packages from a named local repo. --- diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml index c2e1558..19644bd 100644 --- a/fedora_ocaml_rebuild.ml +++ b/fedora_ocaml_rebuild.ml @@ -16,7 +16,9 @@ let koji_target = "rawhide" *) let rebuild_name = "OCaml 4.02.0 beta" -(* Packages that have problems or we just don't want to build. *) +(* Local repository that contains build dependencies. *) +let yum_repo = "koji-rawhide" + let blocked = [ "ocaml-lwt"; "ocaml-react"; (* loganjerry is handling *) ] @@ -137,9 +139,10 @@ and local_build_succeeded pkg = (* Do a local test build to ensure the Koji build will work. *) sh " cd %s - sudo yum-builddep -y %s + sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s fedpkg local " (fedora_repo pkg branch) + (quote yum_repo) (fedora_specfile pkg branch); memory_set key "1" @@ -160,7 +163,8 @@ and specfile_updated pkg = git pull --rebase " repodir; - sh "sudo yum-builddep -y %s" specfile; + sh "sudo yum-builddep -y --disablerepo=\\* --enablerepo=%s %s" + (quote yum_repo) specfile; (* For rationale behind always bumping the spec file, see comment * in 'fedora.ml'.