X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=2bef5bd69215b43066e7c613214108f37f0b6c56;hb=46f3814a6ecce68c5b8ba0a22efcadd27af5a760;hp=02c96114cac2854ca4db2ae8b9a084ed7e49be8e;hpb=6648ed3b76bf34150758ba964e8b02c761bf2f9b;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 02c9611..2bef5bd 100644
--- a/Goalfile
+++ b/Goalfile
@@ -1,161 +1,59 @@
 # See README.
 
+include "fedora.gl"
+
 let fedora-dir = "%HOME/d/fedora"
 
-let branch = "master"
-let side-tag = "f32-ocaml"
-#let koji = "koji"
-let koji = "koji -p riscv64"
-#let fedpkg = "fedpkg"
-let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
+let fedora-branch = "rawhide"
+#let fedora-branch = "f34"
+let fedora-tag = "f41-build-side-90189"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let rebuild-name = "OCaml 4.09.0 for riscv64"
+let fedora-rebuild-name = "OCaml 5.2.0 for Fedora 41"
 
-# Packages that are blocked.  Any dependent packages are also blocked
-# automatically.
-# XXX Not implemented, use ignore for now.
-#let blocked = [ "ocaml-camlp4" ]
+# %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.
-let ignored = [ "ocaml-srpm-macros", "ocaml",
-    # These ones are only needed because blocked is not working
-    "ocaml-camlp4",
-    "cduce",
-    "guestfs-browser",
-    "ocaml-bin-prot",
-    "ocaml-bisect",
-    "ocaml-bitstring",
-    "ocaml-deriving",
-    "ocaml-json-static",
-    "ocaml-mikmatch",
-    "ocaml-openin",
-    "ocaml-pa-monad",
-    "ocaml-pgocaml",
-    "ocaml-sexplib",
-    "ocaml-type-conv",
-    "ocamldsort",
+let fedora-ignored = [
+    "ocaml-srpm-macros", "ocaml",
 ]
 
-# All OCaml-related source package names
-let other-packages = [
-    "alt-ergo", "apron", "brltty", "coccinelle", "coq",
-    "frama-c", "gappalib-coq", "graphviz", "hevea", "hivex",
-    "libguestfs", "opam", "plplot", "virt-top", "virt-v2v",
-    "why3", "z3",
-    "flocq" # no OCaml code, but needs to be rebuilt after Coq
-]
+# 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 ocaml* %other-packages; do
-        [ -f $f/%branch/$f.spec ] && echo "$f"
-    done
-}
-let source-packages = wrap ("*built-in-koji", get-source-packages ())
-
-# Main goal: Rebuild all packages.
-goal all = : source-packages ;
-
-# Check if the source package has been built in Koji.
-tactic *built-in-koji (pkg) = {
-    cd %fedora-dir/%pkg/%branch
-    koji=%koji
-    specfile=%pkg.spec
-
-    # Packages which are ignored are treated as if they were rebuilt already.
-    for p in %ignored; do
-        if [ %pkg = "$p" ]; then exit 0; fi
-    done
-
-    # If the specfile doesn't have the magic string then the
-    # package definitely needs to be rebuilt.
-    grep -sq %rebuild-name $specfile || exit 99
-
-    # Else we must check Koji itself.
-    # Koji sends some messages to stderr.
-    nvr=$(fedpkg verrel)
-    buildinfo=$($koji buildinfo $nvr 2>&1 ||:)
-
-    # No build at all, needs rebuild.
-    echo "$buildinfo" | grep -sq "No such build" && exit 99
-
-    # Exists a build, find out what state it is in.
-    state=$(echo "$buildinfo" | grep ^State: | awk '{print $2}')
-    taskid=$(echo "$buildinfo" | grep ^Task: | awk '{print $2}')
-
-    case "$state" in
-    COMPLETE)
-        # Complete so we don't need to rebuild.
-        exit 0 ;;
-    FAILED)
-        # Failed builds must be examined and fixed manually.
-        exit 1 ;;
-    BUILDING)
-        # Cancel the build, we will resubmit it.
-        $koji cancel $taskid ||:
-        exit 99 ;;
-    CANCELED|DELETED)
-        # Do a rebuild.
-        exit 99 ;;
-    esac
-    # Don't know what happened there, so fail.
-    exit 1
-}
-
-goal rebuild (pkg) =
-*built-in-koji ("%pkg") : wrap ("*built-in-koji", source-dependencies (pkg)) {
-    cd %fedora-dir/%pkg/%branch
-    fedpkg=%fedpkg
-    koji=%koji
-    specfile=%pkg.spec
-
-    # We have to wait for the dependencies to become available
-    # before we can start the new build.
-    for p in %<; do
-        nvr=$($koji --quiet latest-build %side-tag $p | awk '{print $1}')
-        $koji wait-repo %side-tag --build=$nvr
-    done
-
-    # Make sure the local directory is up to date.
-    # This should also fail if there are local changes, which
-    # would need to be corrected/integrated by hand.
-    git pull
-
-    # If the specfile doesn't have the magic string then add
-    # that now.
-    if ! grep -sq %rebuild-name $specfile; then
-        rpmdev-bumpspec -c "- "%rebuild-name *.spec
-    else
-        rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
-    fi
-    $fedpkg commit -c
-    $fedpkg push
-    $fedpkg build --target %side-tag
-}
-
-# Get the source package names for a particular package.
-# Note this is not merely the BuildRequires, since those are
-# the binary packages.  Also this will only find packages
-# which are in the list of source-packages.
-pure function source-dependencies (pkg) returning strings = @{
-    specfile=%fedora-dir/%pkg/%branch/%pkg.spec
-
-    echo Calculating dependencies of %pkg >&2
-
-    for r in $(rpmspec -q --buildrequires $specfile 2>/dev/null |
-               awk '{print $1}'); do
-        # Now we examine each *other* source package to see
-        # if any will create this dependency when they build.
-        for p in %source-packages; do
-            if [ "$p" != %pkg ] && \
-                 rpmspec -q --provides %fedora-dir/$p/%branch/$p.spec 2>/dev/null |
-                 awk '{print $1}' |
-                 grep -sq "^$r\$"
-             then
-                 echo "$p"
+    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
-        done
+            # 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 "ERROR: $pkg: package is not checked out locally" >&2
+            # This does NOT exit the script, why???
+            exit 1
+        fi
     done
 }
+let fedora-source-packages = get-source-packages ()
+
+# Main goal: Rebuild all packages in Koji.
+goal all = : wrap ("is-koji-built", fedora-source-packages)