X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=dcb108ac1a8698f544e61c68dd4f607e6550bded;hb=b91ee0c6ebf30b52607062f2bbabb77aca01bef5;hp=ae15e94252f29db8bef9f068611fa2c5a3cf18ae;hpb=e4f752e941abf3f65b790482ce38409430bceb7d;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index ae15e94..dcb108a 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,17 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f35-build-side-38024"
+let fedora-tag = "f40-build-side-79351"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.12.0 build"
+let fedora-rebuild-name = "OCaml 5.1.1 rebuild for Fedora 40"
+
+# %fedora-retry-failed:
+# If set to 1 then failed builds are retried automatically.
+# If set to 0 then failed builds must be manually restarted.
+# Normally you want this to be 0.
+let fedora-retry-failed = "0"
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
@@ -18,194 +24,31 @@ let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
 ]
 
-# All OCaml-related source package names
-let packages = [
-    "ocaml-alcotest",
-    "ocaml-ancient",
-    "ocaml-astring",
-    "ocaml-augeas",
-    "ocaml-autoconf",
-    "ocaml-base",
-    "ocaml-base64",
-    "ocaml-benchmark",
-    "ocaml-bigarray-compat",
-    "ocaml-biniou",
-    "ocaml-bin-prot",
-    "ocaml-bisect-ppx",
-    "ocaml-cairo",
-    "ocaml-calendar",
-    "ocaml-camlidl",
-    "ocaml-camlimages",
-    "ocaml-camlp5",
-    "ocaml-camomile",
-    "ocaml-charinfo-width",
-    "ocaml-cil",
-    "ocaml-cinaps",
-    "ocaml-cmdliner",
-    "ocaml-compiler-libs-janestreet",
-    "ocaml-cppo",
-    "ocaml-cryptokit",
-    "ocaml-csexp",
-    "ocaml-csv",
-    "ocaml-ctypes",
-    "ocaml-cudf",
-    "ocaml-curl",
-    "ocaml-curses",
-    "ocaml-dbus",
-    "ocaml-dose3",
-    "ocaml-dune",
-    "ocaml-easy-format",
-    "ocaml-expat",
-    "ocaml-extlib",
-    "ocaml-facile",
-    "ocaml-fieldslib",
-    "ocaml-fileutils",
-    "ocaml-findlib",
-    "ocaml-fmt",
-    "ocaml-fpath",
-    "ocaml-gen",
-    "ocaml-gettext",
-    "ocaml-graphics",
-    "ocaml-gsl",
-    "ocamlify",
-    "ocaml-integers",
-    "ocaml-jane-street-headers",
-#   "ocaml-jsonm", https://bugzilla.redhat.com/show_bug.cgi?id=1183825
-    "ocaml-jst-config",
-    "ocaml-lablgl",
-    "ocaml-lablgtk",
-    "ocaml-lablgtk3",
-    "ocaml-labltk",
-    "ocaml-lacaml",
-    "ocaml-lambda-term",
-    "ocaml-libvirt",
-    "ocaml-luv",
-    "ocaml-lwt",
-    "ocaml-lwt-log",
-    "ocaml-markup",
-    "ocaml-mccs",
-    "ocaml-menhir",
-    "ocaml-merlin",
-    "ocaml-mew",
-    "ocaml-mew-vi",
-    "ocaml-migrate-parsetree",
-    "ocaml-mlgmpidl",
-    "ocaml-mlmpfr",
-    "ocaml-mmap",
-    "ocamlmod",
-    "ocaml-mysql",
-    "ocaml-newt",
-    "ocaml-num",
-    "ocaml-oasis",
-    "ocaml-obuild",
-    "ocaml-ocamlbuild",
-    "ocaml-ocamlgraph",
-    "ocaml-ocamlnet",
-    "ocaml-ocp-indent",
-    "ocaml-ocplib-endian",
-    "ocaml-ocplib-simplex",
-    "ocaml-octavius",
-    #"ocaml-odoc",    # Causes dep loop.
-    "ocaml-omake",
-    "ocaml-opam-file-format",
-    "ocaml-ounit",
-    "ocaml-parsexp",
-    "ocaml-pcre",
-    "ocaml-perl4caml",
-    "ocaml-postgresql",
-    "ocaml-ppx-assert",
-    "ocaml-ppx-base",
-    "ocaml-ppx-cold",
-    "ocaml-ppx-compare",
-    "ocaml-ppx-custom-printf",
-    "ocaml-ppx-derivers",
-    "ocaml-ppx-deriving",
-    "ocaml-ppx-deriving-yojson",
-    "ocaml-ppx-enumerate",
-    "ocaml-ppx-fields-conv",
-    "ocaml-ppx-hash",
-    "ocaml-ppx-here",
-    "ocaml-ppx-inline-test",
-    "ocaml-ppx-js-style",
-    "ocaml-ppxlib",
-    "ocaml-ppx-optcomp",
-    "ocaml-ppx-sexp-conv",
-    "ocaml-ppx-tools",
-    "ocaml-ppx-variants-conv",
-    "ocaml-psmt2-frontend",
-    "ocaml-ptmap",
-    "ocaml-qcheck",
-    "ocaml-qtest",
-    "ocaml-re",
-    "ocaml-react",
-    "ocaml-res",
-    "ocaml-result",
-    "ocaml-rope",
-    "ocaml-SDL",
-    "ocaml-sedlex",
-    "ocaml-seq",
-    "ocaml-sexplib",
-    "ocaml-sexplib0",
-    "ocaml-sha",
-    "ocaml-sqlite",
-    "ocaml-ssl",
-    "ocaml-stdint",
-    "ocaml-stdio",
-    "ocaml-time-now",
-    "ocaml-topkg",
-    "ocaml-tplib",
-    "ocaml-trie",
-    "ocaml-tyxml",
-    "ocaml-uuidm",
-    "ocaml-uutf",
-    "ocaml-variantslib",
-    "ocaml-xml-light",
-    "ocaml-xmlm",
-    "ocaml-xmlrpc-light",
-    "ocaml-yojson",
-    "ocaml-zarith",
-    "ocaml-zed",
-    "ocaml-zip",
-    "ocaml-zmq",
-
-    "alt-ergo",
-    "apron",
-    "brltty",
-    "coccinelle",
-    "coq",
-    "flocq",
-    "frama-c",
-    "gappalib-coq",
-    "graphviz",
-    "haxe",
-    "hevea",
-    "hivex",
-    "laby",
-    "libguestfs",
-    "libnbd",
-    "opam",
-    "plplot",
-    "prooftree",
-    "utop",
-    "virt-top",
-    "virt-v2v",
-    "why3",
-    "z3",
-    "zenon",
-
-    # 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",
-]
+# Include the full list of packages for either Fedora or ELN.
+include "./fedora-packages.gl"
+#include "./eln-packages.gl"
 
+# Get the list of source packages.
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
-    for f in %packages; do
-        if [ -f $f/%fedora-branch/$f.spec ]; then
-            echo "$f"
+    for pkg in %packages; do
+        spec=$pkg/%fedora-branch/$pkg.spec
+        if [ -f $spec ]; then
+            # Check that the spec file excludes i686.
+            # 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
+            # OK to rebuild this package.
+            echo "$pkg"
+        elif [ -f $pkg/%fedora-branch/dead.package ]; then
+            echo "WARNING: $pkg: is a dead package, ignored" >&2
         else
-            echo "$f: package is not checked out locally" >&2
+            echo "ERROR: $pkg: package is not checked out locally" >&2
+            # This does NOT exit the script, why???
             exit 1
         fi
     done