X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=35909e0987af4191cd3150320700d8cfcfaf2b6f;hb=3a10c0c2da969efc3b9b3aa153aac7dcc673c0fe;hp=0df6b0713939d162991b52b0d9c9d510839c0a51;hpb=0271343252d99d26e34b3f79247f7791a5c19b00;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 0df6b07..35909e0 100644
--- a/Goalfile
+++ b/Goalfile
@@ -1,129 +1,62 @@
 # See README.
 
+include "fedora.gl"
+
 let fedora-dir = "%HOME/d/fedora"
 
-let branch = "master"
-let side-tag = "f32-build-side-999999"
+let fedora-branch = "master"
+let fedora-tag = "f32-build-side-18015"
+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.
-let rebuild-name = "OCaml 4.10.0 (beta 1)"
+let fedora-rebuild-name = "OCaml 4.10.0+beta1 rebuild."
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
-let blocked = [ "ocaml-camlp4" ]
+# XXX Not implemented, use ignore for now.
+#let fedora-blocked = [ "ocaml-camlp4" ]
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
-let ignored = [ "ocaml-srpm-macros", "ocaml" ]
+let fedora-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",
+]
 
 # 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
+    "libguestfs", "libnbd", "nbdkit", "opam", "plplot",
+    "virt-top", "virt-v2v", "why3", "z3",
+    # no OCaml code, but needs to be rebuilt after Coq
+    "flocq"
 ]
-pure function get-source-packages () = {
+pure function get-source-packages () returning strings = {
     cd %fedora-dir
-    echo '['
     for f in ocaml* %other-packages; do
-        [ -f $f/%branch/$f.spec ] && echo "*built-in-koji(\"$f\"),"
+        [ -f $f/%fedora-branch/$f.spec ] && echo "$f"
     done
-    echo ']'
 }
-let source-packages = get-source-packages ()
+let fedora-source-packages = 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
-    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.
-    nvr=$(fedpkg verrel)
-    buildinfo=$(koji buildinfo $nvr)
-
-    # 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") : source-dependencies (pkg) {
-    cd %fedora-dir/%pkg/%branch
-    specfile=%pkg.spec
-
-    # 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
-}
-
-# 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) = @{
-    specfile=%fedora-dir/%pkg/%branch/%pkg.spec
-
-    echo -n Dependencies of %pkg: >&2
-
-    echo '['
-    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 "*built-in-koji(\"$p\"),"
-                 echo -n '' $p >&2
-            fi
-        done
-    done
-    echo ']'
-    echo >&2
-}
+goal all = : wrap ("*koji-built", fedora-source-packages)