Browse Source

scripts/machine-summary: show patch count in the overview

Instead of simply adding a tag saying "Patched", include the patch count
and make a judgement call on whether the patches are "safe" or not. For
example, patches which are entirely backports or inappropriate are
"safe", pending and denied patches are not.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Ross Burton 3 years ago
parent
commit
72bb1adf3f
2 changed files with 18 additions and 1 deletions
  1. 11 0
      scripts/machine-summary.py
  2. 7 1
      scripts/report-index.html.jinja

+ 11 - 0
scripts/machine-summary.py

@@ -24,6 +24,12 @@ def needs_update(version, upstream):
         version = version.replace("+git", "")
     return version != upstream
 
+def safe_patches(patches):
+    for info in patches:
+        if info["status"] in ("Denied", "Pending", "Unknown"):
+            return False
+    return True
+
 def layer_path(layername, d):
     """
     Return the path to the specified layer, or None if the layer isn't present.
@@ -100,6 +106,7 @@ def harvest_data(machines, recipes):
                 details["fullversion"] = d.getVar("PV")
                 details["patches"] = [extract_patch_info(p, d) for p in oe.patch.src_patches(d)]
                 details["patched"] = bool(details["patches"])
+                details["patches_safe"] = safe_patches(details["patches"])
 
     # Now backfill the upstream versions
     for machine in versions:
@@ -148,11 +155,15 @@ class Format:
         template_dir = os.path.dirname(os.path.abspath(__file__))
         env = jinja2.Environment(
             loader=jinja2.FileSystemLoader(template_dir),
+            extensions=['jinja2.ext.i18n'],
             autoescape=jinja2.select_autoescape(),
             trim_blocks=True,
             lstrip_blocks=True
         )
 
+        # We only need i18n for plurals
+        env.install_null_translations()
+
         return env.get_template(name)
 
 class TextOverview(Format):

+ 7 - 1
scripts/report-index.html.jinja

@@ -26,7 +26,13 @@
             {% if details.patches or details.needs_update %}
             <br>
             {% if details.patches %}
-              <span class="tag is-info">Patched</span>
+              <span class="tag {{ "is-info" if details.patches_safe else "is-danger" }}">
+                {% trans count=details.patches|length %}
+                  {{ count }} Patch
+                {% pluralize %}
+                  {{ count }} Patches
+                {% endtrans %}
+              </span>
             {% endif %}
             {% if details.needs_update %}
               <span class="tag is-danger">Upgrade</span>