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

diff --git a/zephyr/zmake/zmake/jobserver.py b/zephyr/zmake/zmake/jobserver.py
deleted file mode 100644
index 69199a2dc8..0000000000
--- a/zephyr/zmake/zmake/jobserver.py
+++ /dev/null
@@ -1,144 +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.
-"""Module for job counters, limiting the amount of concurrent executions."""
-
-import logging
-import multiprocessing
-import os
-import re
-import select
-import subprocess
-
-import zmake
-
-
-class JobHandle:
-    """Small object to handle claim of a job."""
-
-    def __init__(self, release_func, *args, **kwargs):
-        self.release_func = release_func
-        self.args = args
-        self.kwargs = kwargs
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.release_func(*self.args, **self.kwargs)
-
-
-class JobClient:
-    """Abstract base class for all job clients."""
-
-    def get_job(self):
-        """Claim a job."""
-        raise NotImplementedError("Abstract method not implemented")
-
-    def env(self):
-        """Get the environment variables necessary to share the job server."""
-        return {}
-
-    def popen(self, *args, **kwargs):
-        """Start a process using subprocess.Popen
-
-        All other arguments are passed to subprocess.Popen.
-
-        Returns:
-            A Popen object.
-        """
-        kwargs.setdefault("env", os.environ)
-        kwargs["env"].update(self.env())
-
-        logger = logging.getLogger(self.__class__.__name__)
-        logger.debug("Running %s", zmake.util.repr_command(*args))
-        return subprocess.Popen(*args, **kwargs)
-
-    def run(self, *args, claim_job=True, **kwargs):
-        """Run a process using subprocess.run, optionally claiming a job.
-
-        Args:
-            claim_job: True if a job should be claimed.
-
-        All other arguments are passed to subprocess.run.
-
-        Returns:
-            A CompletedProcess object.
-        """
-        if claim_job:
-            with self.get_job():
-                return self.run(*args, claim_job=False, **kwargs)
-
-        kwargs.setdefault("env", os.environ)
-        kwargs["env"].update(self.env())
-
-        return subprocess.run(*args, **kwargs)
-
-
-class JobServer(JobClient):
-    """Abstract Job Server."""
-
-    def __init__(self, jobs=0):
-        raise NotImplementedError("Abstract method not implemented")
-
-
-class GNUMakeJobClient(JobClient):
-    def __init__(self, read_fd, write_fd):
-        self._pipe = [read_fd, write_fd]
-
-    @classmethod
-    def from_environ(cls, env=None):
-        """Create a job client from an environment with the MAKEFLAGS variable.
-
-        If we are started under a GNU Make Job Server, we can search
-        the environment for a string "--jobserver-auth=R,W", where R
-        and W will be the read and write file descriptors to the pipe
-        respectively.  If we don't find this environment variable (or
-        the string inside of it), this will raise an OSError.
-
-        Args:
-            env: Optionally, the environment to search.
-
-        Returns:
-            A GNUMakeJobClient configured appropriately.
-        """
-        if env is None:
-            env = os.environ
-        makeflags = env.get("MAKEFLAGS")
-        if not makeflags:
-            raise OSError("MAKEFLAGS is not set in the environment")
-        match = re.search(r"--jobserver-auth=(\d+),(\d+)", makeflags)
-        if not match:
-            raise OSError("MAKEFLAGS did not contain jobserver flags")
-        read_fd, write_fd = map(int, match.groups())
-        return cls(read_fd, write_fd)
-
-    def get_job(self):
-        """Claim a job.
-
-        Returns:
-            A JobHandle object.
-        """
-        byte = os.read(self._pipe[0], 1)
-        return JobHandle(lambda: os.write(self._pipe[1], byte))
-
-    def env(self):
-        """Get the environment variables necessary to share the job server."""
-        return {"MAKEFLAGS": "--jobserver-auth={},{}".format(*self._pipe)}
-
-
-class GNUMakeJobServer(JobServer, GNUMakeJobClient):
-    """Implements a GNU Make POSIX Job Server.
-
-    See https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html
-    for specification.
-    """
-
-    def __init__(self, jobs=0):
-        if not jobs:
-            jobs = multiprocessing.cpu_count()
-        elif jobs > select.PIPE_BUF:
-            jobs = select.PIPE_BUF
-
-        self._pipe = os.pipe()
-        os.write(self._pipe[1], b"+" * jobs)