X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=2961971ffb4e77eb3e31f2c798099500189c4495;hb=63839acb139d5381ee4615a7f467db9521e4305a;hp=e0c94343a59d9caa4cf841271227ede4df61f7eb;hpb=5b583cbf8c9876be9a70e059696ad43c4ccff80f;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index e0c9434..2961971 100644
--- a/Goalfile
+++ b/Goalfile
@@ -3,47 +3,66 @@
 let fedora-dir = "%HOME/d/fedora"
 
 let branch = "master"
-let side-tag = "f32-ocaml"
-#let koji = "koji"
-let koji = "koji -p riscv64"
+let side-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.09.0 for riscv64"
+let 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 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 ignored = [ "ocaml-srpm-macros" ]
+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",
+]
 
 # 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/%branch/$f.spec ] && echo "$f"
     done
-    echo ']'
 }
-let source-packages = get-source-packages ()
+let source-packages = wrap ("*koji-built", 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) = {
+tactic *koji-built (pkg) = {
     cd %fedora-dir/%pkg/%branch
+    koji=%koji
     specfile=%pkg.spec
 
     # Packages which are ignored are treated as if they were rebuilt already.
@@ -56,8 +75,9 @@ tactic *built-in-koji (pkg) = {
     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)
+    buildinfo=$($koji buildinfo $nvr 2>&1 ||:)
 
     # No build at all, needs rebuild.
     echo "$buildinfo" | grep -sq "No such build" && exit 99
@@ -75,7 +95,7 @@ tactic *built-in-koji (pkg) = {
         exit 1 ;;
     BUILDING)
         # Cancel the build, we will resubmit it.
-        %koji cancel $taskid
+        $koji cancel $taskid ||:
         exit 99 ;;
     CANCELED|DELETED)
         # Do a rebuild.
@@ -86,16 +106,24 @@ tactic *built-in-koji (pkg) = {
 }
 
 goal rebuild (pkg) =
-*built-in-koji ("%pkg") : source-dependencies (pkg) {
+*koji-built ("%pkg") : wrap ("*koji-built", 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 $(%koji latest-build %< | awk '{print $1}'); do
-        %koji --quiet wait-repo side-tag
+    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
@@ -103,26 +131,20 @@ goal rebuild (pkg) =
     else
         rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
     fi
-    fedpkg commit -c
-    fedpkg push
-    if [ %koji = "koji" ]; then
-        fedpkg build
-    else
-        hash=$(git rev-parse HEAD)
-        %koji build "git+https://src.fedoraproject.org/rpms/"%pkg".git#$hash" %side-tag
-    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) = @{
+pure function source-dependencies (pkg) returning strings = @{
     specfile=%fedora-dir/%pkg/%branch/%pkg.spec
 
-    echo -n Dependencies of %pkg: >&2
+    echo Calculating 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
@@ -133,11 +155,8 @@ pure function source-dependencies (pkg) = @{
                  awk '{print $1}' |
                  grep -sq "^$r\$"
              then
-                 echo "*built-in-koji(\"$p\"),"
-                 echo -n '' $p >&2
+                 echo "$p"
             fi
         done
     done
-    echo ']'
-    echo >&2
 }