git.annexia.org
/
fedora-ocaml-rebuild.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove nbdkit, built by hand.
[fedora-ocaml-rebuild.git]
/
Goalfile
diff --git
a/Goalfile
b/Goalfile
index
8022963
..
3bd6c85
100644
(file)
--- a/
Goalfile
+++ b/
Goalfile
@@
-6,10
+6,6
@@
let fedora-dir = "%HOME/d/fedora"
let fedora-branch = "master"
let fedora-tag = "f33-build-side-19773"
let fedora-branch = "master"
let fedora-tag = "f33-build-side-19773"
-let koji = "koji"
-#let koji = "koji -p riscv64"
-let fedpkg = "fedpkg"
-#let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
# The magic string that must appear in %changelog when the
# package has been rebuilt.
# The magic string that must appear in %changelog when the
# package has been rebuilt.
@@
-30,7
+26,7
@@
let fedora-ignored = [
let other-packages = [
"alt-ergo", "apron", "brltty",
"graphviz", "hevea", "hivex",
let other-packages = [
"alt-ergo", "apron", "brltty",
"graphviz", "hevea", "hivex",
- "libguestfs", "libnbd",
"nbdkit",
+ "libguestfs", "libnbd",
"opam",
"plplot",
"virt-top", "virt-v2v",
"opam",
"plplot",
"virt-top", "virt-v2v",
@@
-47,7
+43,13
@@
let other-packages = [
# Coccinelle uses -unsafe-string.
# "coccinelle",
# Coccinelle uses -unsafe-string.
# "coccinelle",
+
+ # Causes a cyclic dependency between libnbd <-> nbdkit. We need
+ # to fix this in goals itself, but in the meantime disable nbdkit
+ # and build it by hand.
+ # "nbdkit",
]
]
+
pure function get-source-packages () returning strings = {
cd %fedora-dir
for f in ocaml* %other-packages; do
pure function get-source-packages () returning strings = {
cd %fedora-dir
for f in ocaml* %other-packages; do
@@
-57,4
+59,4
@@
pure function get-source-packages () returning strings = {
let fedora-source-packages = get-source-packages ()
# Main goal: Rebuild all packages in Koji.
let fedora-source-packages = get-source-packages ()
# Main goal: Rebuild all packages in Koji.
-goal all = : wrap ("
*
koji-built", fedora-source-packages)
+goal all = : wrap ("
is-
koji-built", fedora-source-packages)