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
Add guestfs-tools
[fedora-ocaml-rebuild.git]
/
Goalfile
diff --git
a/Goalfile
b/Goalfile
index
1c96dd4
..
eabbb98
100644
(file)
--- a/
Goalfile
+++ b/
Goalfile
@@
-45,7
+45,8
@@
let packages = [
"ocaml-camlidl",
"ocaml-camlimages",
"ocaml-camlp-streams",
"ocaml-camlidl",
"ocaml-camlimages",
"ocaml-camlp-streams",
- "ocaml-camlp5",
+ # Waiting on two dependencies to be reviewed
+ #"ocaml-camlp5",
"ocaml-camomile",
"ocaml-cinaps",
"ocaml-cmdliner",
"ocaml-camomile",
"ocaml-cinaps",
"ocaml-cmdliner",
@@
-60,8
+61,7
@@
let packages = [
"ocaml-curses",
"ocaml-dbus",
"ocaml-dose3",
"ocaml-curses",
"ocaml-dbus",
"ocaml-dose3",
- # Cyclic dependency ocaml-dune -> ocaml-pp -> ocaml-dune
- #"ocaml-dune",
+ "ocaml-dune",
"ocaml-easy-format",
"ocaml-expat",
"ocaml-extlib",
"ocaml-easy-format",
"ocaml-expat",
"ocaml-extlib",
@@
-194,8
+194,11
@@
let packages = [
"flocq",
"frama-c",
"gappalib-coq",
"flocq",
"frama-c",
"gappalib-coq",
- "graphviz",
- "haxe",
+ "guestfs-tools",
+ # Depends on swig:
+ #"graphviz",
+ # Depends on camlp5:
+ #"haxe",
"hevea",
"hivex",
"libguestfs",
"hevea",
"hivex",
"libguestfs",
@@
-204,7
+207,8
@@
let packages = [
"plplot",
"prooftree",
"supermin",
"plplot",
"prooftree",
"supermin",
- "swig",
+ # Tests fail for unclear reasons.
+ #"swig",
"utop",
"virt-top",
"virt-v2v",
"utop",
"virt-top",
"virt-v2v",
@@
-225,7
+229,10
@@
pure function get-source-packages () returning strings = {
spec=$pkg/%fedora-branch/$pkg.spec
if [ -f $spec ]; then
# Check that the spec file excludes i686.
spec=$pkg/%fedora-branch/$pkg.spec
if [ -f $spec ]; then
# Check that the spec file excludes i686.
- if ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
+ # Only implement this check for ocaml-* packages, as the
+ # other packages are more complicated.
+ if [[ "$spec" =~ ^ocaml ]] &&
+ ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
echo "ERROR: $pkg does not ExcludeArch: %%{ix86}" >&2
exit 1
fi
echo "ERROR: $pkg does not ExcludeArch: %%{ix86}" >&2
exit 1
fi