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, 273 deletions

diff --git a/zephyr/zmake/zmake/__main__.py b/zephyr/zmake/zmake/__main__.py
deleted file mode 100644
index 31f0436b5a..0000000000
--- a/zephyr/zmake/zmake/__main__.py
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 2020 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.
-
-"""The entry point into zmake."""
-import argparse
-import inspect
-import logging
-import os
-import pathlib
-import sys
-
-import zmake.multiproc as multiproc
-import zmake.zmake as zm
-
-
-def maybe_reexec(argv):
-    """Re-exec zmake from the EC source tree, if possible and desired.
-
-    Zmake installs into the users' chroot, which makes it convenient
-    to execute, but can sometimes become tedious when zmake changes
-    land and users haven't upgraded their chroots yet.
-
-    We can partially subvert this problem by re-execing zmake from the
-    source if it's available.  This won't make it so developers never
-    need to upgrade their chroots (e.g., a toolchain upgrade could
-    require chroot upgrades), but at least makes it slightly more
-    convenient for an average repo sync.
-
-    Args:
-        argv: The argument list passed to the main function, not
-            including the executable path.
-
-    Returns:
-        None, if the re-exec did not happen, or never returns if the
-        re-exec did happen.
-    """
-    # We only re-exec if we are inside of a chroot (since if installed
-    # standalone using pip, there's already an "editable install"
-    # feature for that in pip.)
-    env = dict(os.environ)
-    srcroot = env.get("CROS_WORKON_SRCROOT")
-    if not srcroot:
-        return
-
-    # If for some reason we decide to move zmake in the future, then
-    # we don't want to use the re-exec logic.
-    zmake_path = (
-        pathlib.Path(srcroot) / "src" / "platform" / "ec" / "zephyr" / "zmake"
-    ).resolve()
-    if not zmake_path.is_dir():
-        return
-
-    # If PYTHONPATH is set, it is either because we just did a
-    # re-exec, or because the user wants to run a specific copy of
-    # zmake.  In either case, we don't want to re-exec.
-    if "PYTHONPATH" in env:
-        return
-
-    # Set PYTHONPATH so that we run zmake from source.
-    env["PYTHONPATH"] = str(zmake_path)
-
-    os.execve(sys.executable, [sys.executable, "-m", "zmake", *argv], env)
-
-
-def call_with_namespace(func, namespace):
-    """Call a function with arguments applied from a Namespace.
-
-    Args:
-        func: The callable to call.
-        namespace: The namespace to apply to the callable.
-
-    Returns:
-        The result of calling the callable.
-    """
-    kwds = {}
-    sig = inspect.signature(func)
-    names = [p.name for p in sig.parameters.values()]
-    for name, value in vars(namespace).items():
-        pyname = name.replace("-", "_")
-        if pyname in names:
-            kwds[pyname] = value
-    return func(**kwds)
-
-
-# Dictionary used to map log level strings to their corresponding int values.
-log_level_map = {
-    "DEBUG": logging.DEBUG,
-    "INFO": logging.INFO,
-    "WARNING": logging.WARNING,
-    "ERROR": logging.ERROR,
-    "CRITICAL": logging.CRITICAL,
-}
-
-
-def main(argv=None):
-    """The main function.
-
-    Args:
-        argv: Optionally, the command-line to parse, not including argv[0].
-
-    Returns:
-        Zero upon success, or non-zero upon failure.
-    """
-    if argv is None:
-        argv = sys.argv[1:]
-
-    maybe_reexec(argv)
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--checkout", type=pathlib.Path, help="Path to ChromiumOS checkout"
-    )
-    parser.add_argument(
-        "-D",
-        "--debug",
-        action="store_true",
-        default=False,
-        help=("Turn on debug features (e.g., stack trace, " "verbose logging)"),
-    )
-    parser.add_argument(
-        "-j",
-        "--jobs",
-        # TODO(b/178196029): ninja doesn't know how to talk to a
-        # jobserver properly and spams our CPU on all cores.  Default
-        # to -j1 to execute sequentially until we switch to GNU Make.
-        default=1,
-        type=int,
-        help="Degree of multiprogramming to use",
-    )
-    parser.add_argument(
-        "-l",
-        "--log-level",
-        choices=list(log_level_map.keys()),
-        dest="log_level",
-        help="Set the logging level (default=INFO)",
-    )
-    parser.add_argument(
-        "-L",
-        "--no-log-label",
-        action="store_false",
-        help="Turn off logging labels",
-        dest="log_label",
-        default=None,
-    )
-    parser.add_argument(
-        "--log-label",
-        action="store_true",
-        help="Turn on logging labels",
-        dest="log_label",
-        default=None,
-    )
-    parser.add_argument(
-        "--modules-dir",
-        type=pathlib.Path,
-        help="The path to a directory containing all modules "
-        "needed.  If unspecified, zmake will assume you have "
-        "a Chrome OS checkout and try locating them in the "
-        "checkout.",
-    )
-    parser.add_argument(
-        "--zephyr-base", type=pathlib.Path, help="Path to Zephyr OS repository"
-    )
-
-    sub = parser.add_subparsers(dest="subcommand", help="Subcommand")
-    sub.required = True
-
-    configure = sub.add_parser("configure")
-    configure.add_argument(
-        "--ignore-unsupported-zephyr-version",
-        action="store_true",
-        help="Don't warn about using an unsupported Zephyr version",
-    )
-    configure.add_argument("-t", "--toolchain", help="Name of toolchain to use")
-    configure.add_argument(
-        "--bringup",
-        action="store_true",
-        dest="bringup",
-        help="Enable bringup debugging features",
-    )
-    configure.add_argument(
-        "-B", "--build-dir", type=pathlib.Path, help="Build directory"
-    )
-    configure.add_argument(
-        "-b",
-        "--build",
-        action="store_true",
-        dest="build_after_configure",
-        help="Run the build after configuration",
-    )
-    configure.add_argument(
-        "--test",
-        action="store_true",
-        dest="test_after_configure",
-        help="Test the .elf file after configuration",
-    )
-    configure.add_argument(
-        "project_dir", type=pathlib.Path, help="Path to the project to build"
-    )
-    configure.add_argument(
-        "-c",
-        "--coverage",
-        action="store_true",
-        dest="coverage",
-        help="Enable CONFIG_COVERAGE Kconfig.",
-    )
-
-    build = sub.add_parser("build")
-    build.add_argument(
-        "build_dir",
-        type=pathlib.Path,
-        help="The build directory used during configuration",
-    )
-    build.add_argument(
-        "-w",
-        "--fail-on-warnings",
-        action="store_true",
-        help="Exit with code 2 if warnings are detected",
-    )
-
-    test = sub.add_parser("test")
-    test.add_argument(
-        "build_dir",
-        type=pathlib.Path,
-        help="The build directory used during configuration",
-    )
-
-    sub.add_parser("testall")
-
-    coverage = sub.add_parser("coverage")
-    coverage.add_argument(
-        "build_dir",
-        type=pathlib.Path,
-        help="The build directory used during configuration",
-    )
-
-    opts = parser.parse_args(argv)
-
-    # Default logging
-    log_level = logging.INFO
-    log_label = False
-
-    if opts.log_level:
-        log_level = log_level_map[opts.log_level]
-        log_label = True
-    elif opts.debug:
-        log_level = logging.DEBUG
-        log_label = True
-
-    if opts.log_label is not None:
-        log_label = opts.log_label
-    if log_label:
-        log_format = "%(levelname)s: %(message)s"
-    else:
-        log_format = "%(message)s"
-        multiproc.log_job_names = False
-
-    logging.basicConfig(format=log_format, level=log_level)
-
-    if not opts.debug:
-        sys.tracebacklimit = 0
-
-    try:
-        zmake = call_with_namespace(zm.Zmake, opts)
-        subcommand_method = getattr(zmake, opts.subcommand.replace("-", "_"))
-        result = call_with_namespace(subcommand_method, opts)
-        return result
-    finally:
-        multiproc.wait_for_log_end()
-
-
-if __name__ == "__main__":
-    sys.exit(main())