[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] docs/support-matrix: unbreak docs rendering

commit 11ba5cdb8489e4dfc1e50c948dba23cece559e77
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Jun 4 21:39:37 2020 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Jun 8 15:19:49 2020 +0100

    docs/support-matrix: unbreak docs rendering
    The cronjob which renders https://xenbits.xen.org/docs/ has been broken for 
    while.  commitish_version() pulls an old version of xen/Makefile out of
    history, and uses the xenversion rule.
    Currently, this fails with:
      tmp.support-matrix.xen.make:130: scripts/Kbuild.include: No such file or 
    which is because the Makefile legitimately references Kbuild.include with a
    relative rather than absolute path.
    Rework support-matrix-generate to use sed to extract the major/minor 
    rather than expecting xen/Makefile to be usable in a different tree.
    Fixes: 945e80a7301f ("docs: Provide support-matrix-generate, to generate a 
support matrix in HTML")
    Backport: 4.11+
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Release-acked-by: Paul Durrant <paul@xxxxxxx>
 docs/support-matrix-generate | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/support-matrix-generate b/docs/support-matrix-generate
index a3d93321f1..8a27849cf6 100755
--- a/docs/support-matrix-generate
+++ b/docs/support-matrix-generate
@@ -27,8 +27,8 @@
 # Then we try to find the next previous revision.  This is done by
 # extracting the current version number from xen/Makefile.  (We make
-# some slight assumption about how xen/Makefile's xenversion target
-# works, because we want to be able to do this without checking out
+# some slight assumption about how xen/Makefile's variables are
+# written, because we want to be able to do this without checking out
 # the whole tree for the version in question.)  Then we use git log on
 # xen/Makefile to try to find a commit where the version changed.
 # This gives us the previous version number, NN.
@@ -102,12 +102,16 @@ commitish_version () {
     git cat-file blob "$commitish:$versionfile" >"$tmp_versionfile"
-    version=$(make --no-print-directory -C docs \
-                   -f "${tmp_versionfile#docs/}" xenversion)
-    case "$version" in
-        *.*.*) version="${version%.*}" ;;
-    esac
-    printf "%s\n" "${version%%-*}"
+    local maj=$(sed -n 's/.*XEN_VERSION.*= \([0-9]\+\)/\1/p' < 
+    local min=$(sed -n 's/.*XEN_SUBVERSION.*= \([0-9]\+\)/\1/p' < 
+    if [ -z $maj ] || [ -z $min ];
+    then
+        fail "Unable to identify Xen version for $commitish";
+    fi
+    printf "%d.%d\n" "$maj" "$min"
 exec 4>"$tmp_revisions"
generated by git-patchbot for /home/xen/git/xen.git#staging



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.