ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 166 deletions

diff --git a/zephyr/zmake/zmake/version.py b/zephyr/zmake/zmake/version.py
deleted file mode 100644
index 47aba6d804..0000000000
--- a/zephyr/zmake/zmake/version.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import datetime
-import getpass
-import io
-import os
-import platform
-import subprocess
-
-import zmake.util as util
-
-
-def _get_num_commits(repo):
-    """Get the number of commits that have been made.
-
-    If a Git repository is available, return the number of commits that have
-    been made. Otherwise return a fixed count.
-
-    Args:
-        repo: The path to the git repo.
-
-    Returns:
-        An integer, the number of commits that have been made.
-    """
-    try:
-        result = subprocess.run(
-            ["git", "-C", repo, "rev-list", "HEAD", "--count"],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL,
-            encoding="utf-8",
-        )
-    except subprocess.CalledProcessError:
-        commits = "9999"
-    else:
-        commits = result.stdout
-
-    return int(commits)
-
-
-def _get_revision(repo):
-    """Get the current revision hash.
-
-    If a Git repository is available, return the hash of the current index.
-    Otherwise return the hash of the VCSID environment variable provided by
-    the packaging system.
-
-    Args:
-        repo: The path to the git repo.
-
-    Returns:
-        A string, of the current revision.
-    """
-    try:
-        result = subprocess.run(
-            ["git", "-C", repo, "log", "-n1", "--format=%H"],
-            check=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL,
-            encoding="utf-8",
-        )
-    except subprocess.CalledProcessError:
-        # Fall back to the VCSID provided by the packaging system.
-        # Format is 0.0.1-r425-032666c418782c14fe912ba6d9f98ffdf0b941e9 for
-        # releases and 9999-032666c418782c14fe912ba6d9f98ffdf0b941e9 for
-        # 9999 ebuilds.
-        vcsid = os.environ.get("VCSID", "9999-unknown")
-        revision = vcsid.rsplit("-", 1)[1]
-    else:
-        revision = result.stdout
-
-    return revision
-
-
-def get_version_string(project, zephyr_base, modules, static=False):
-    """Get the version string associated with a build.
-
-    Args:
-        project: a zmake.project.Project object
-        zephyr_base: the path to the zephyr directory
-        modules: a dictionary mapping module names to module paths
-        static: if set, create a version string not dependent on git
-            commits, thus allowing binaries to be compared between two
-            commits.
-
-    Returns:
-        A version string which can be placed in FRID, FWID, or used in
-        the build for the OS.
-    """
-    major_version, minor_version, *_ = util.read_zephyr_version(zephyr_base)
-    project_id = project.project_dir.parts[-1]
-    num_commits = 0
-
-    if static:
-        vcs_hashes = "STATIC"
-    else:
-        repos = {
-            "os": zephyr_base,
-            **modules,
-        }
-
-        for repo in repos.values():
-            num_commits += _get_num_commits(repo)
-
-        vcs_hashes = ",".join(
-            "{}:{}".format(name, _get_revision(repo)[:6])
-            for name, repo in sorted(
-                repos.items(),
-                # Put the EC module first, then Zephyr OS kernel, as
-                # these are probably the most important hashes to
-                # developers.
-                key=lambda p: (p[0] != "ec", p[0] != "os", p),
-            )
-        )
-
-    return "{}_v{}.{}.{}-{}".format(
-        project_id, major_version, minor_version, num_commits, vcs_hashes
-    )
-
-
-def write_version_header(version_str, output_path, static=False):
-    """Generate a version header and write it to the specified path.
-
-    Generate a version header in the format expected by the EC build
-    system, and write it out only if the version header does not exist
-    or changes.  We don't write in the case that the version header
-    does exist and was unchanged, which allows "zmake build" commands
-    on an unchanged tree to be an effective no-op.
-
-    Args:
-        version_str: The version string to be used in the header, such
-            as one generated by get_version_string.
-        output_path: The file path to write at (a pathlib.Path
-            object).
-        static: If true, generate a header which does not include
-            information like the username, hostname, or date, allowing
-            the build to be reproducible.
-    """
-    output = io.StringIO()
-    output.write("/* This file is automatically generated by zmake */\n")
-
-    def add_def(name, value):
-        output.write("#define {} {}\n".format(name, util.c_str(value)))
-
-    def add_def_unquoted(name, value):
-        output.write("#define {} {}\n".format(name, value))
-
-    add_def("VERSION", version_str)
-    add_def("CROS_EC_VERSION32", version_str[:31])
-
-    if static:
-        add_def("BUILDER", "reproducible@build")
-        add_def("DATE", "STATIC_VERSION_DATE")
-    else:
-        add_def("BUILDER", "{}@{}".format(getpass.getuser(), platform.node()))
-        add_def("DATE", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
-
-    add_def("CROS_FWID_MISSING_STR", "CROS_FWID_MISSING")
-    # TODO(b/198475757): Add zmake support for getting CROS_FWID32
-    add_def_unquoted("CROS_FWID32", "CROS_FWID_MISSING_STR")
-
-    contents = output.getvalue()
-    if not output_path.exists() or output_path.read_text() != contents:
-        output_path.write_text(contents)