Drop cros-workon.eclass and replace with git-r3.eclass

The cros_workon tool has been replaced with a simpler flatcar_workon
tool based around git-r3.

Signed-off-by: James Le Cuirot <[email protected]>

Author: chewi

bash_completion

@@ -106,124 +106,28 @@ _autotest_complete() {
   _complete_board_sysroot_flag && return 0
 }
 
-# Complete cros_workon's <command> argument.
+# Complete flatcar_workon's <command> argument.
 #
 # TODO(petkov): We should probably extract the list of commands from
-# cros_workon --help, just like we do for flags (see _flag_complete).
+# flatcar_workon --help, just like we do for flags (see _flag_complete).
 #
 # TODO(petkov): Currently, this assumes that the command is the first
 # argument. In practice, the command is the first non-flag
 # argument. I.e., this should be fixed to support something like
-# "cros_workon --all list".
-_complete_cros_workon_command() {
+# "flatcar_workon --all list".
+_complete_flatcar_workon_command() {
   [ ${COMP_CWORD} -eq 1 ] || return 1
   local command="${COMP_WORDS[1]}"
-  COMPREPLY=($(compgen -W "start stop list iterate" -- "$command"))
+  COMPREPLY=($(compgen -W "start stop list" -- "$command"))
   return 0
 }
 
-# Prints the full path to the cros_workon executable, handling tilde
-# expansion for the current user.
-_cros_workon_executable() {
-  local cros_workon="${COMP_WORDS[0]}"
-  if [[ "$cros_workon" == '~/'* ]]; then
-    cros_workon="$HOME/${cros_workon#'~/'}"
-  fi
-  echo "$cros_workon"
-}
-
-# Lists the workon (or live, if --all is passed in) ebuilds. Lists
-# both the full names (e.g., chromeos-base/metrics) as well as just
-# the ebuild names (e.g., metrics).
-_cros_workon_list() {
-  local cros_workon=$(_cros_workon_executable)
-  ${cros_workon} list $1 | sed 's,\(.\+\)/\(.\+\),\1/\2 \2,'
-}
-
-# Completes the current cros_workon argument assuming it's a
-# package/ebuild name.
-_complete_cros_workon_package() {
-  [ ${COMP_CWORD} -gt 1 ] || return 1
-  local package="${COMP_WORDS[COMP_CWORD]}"
-  local command="${COMP_WORDS[1]}"
-  # If "start", complete based on all workon packages.
-  if [[ ${command} == "start" ]]; then
-    COMPREPLY=($(compgen -W "$(_cros_workon_list --all)" -- "$package"))
-    return 0
-  fi
-  # If "stop" or "iterate", complete based on all live packages.
-  if [[ ${command} == "stop" ]] || [[ ${command} == "iterate" ]]; then
-    COMPREPLY=($(compgen -W "$(_cros_workon_list)" -- "$package"))
-    return 0
-  fi
-  return 1
-}
-
-# Complete cros_workon arguments.
-_cros_workon() {
+# Complete flatcar_workon arguments.
+_flatcar_workon() {
   COMPREPLY=()
   _flag_complete && return 0
   _complete_board_sysroot_flag && return 0
-  _complete_cros_workon_command && return 0
-  _complete_cros_workon_package && return 0
-  return 0
-}
-
-_list_repo_commands() {
-  local repo=${COMP_WORDS[0]}
-  "$repo" help --all | grep -E '^  ' | sed 's/  \([^ ]\+\) .\+/\1/'
-}
-
-_list_repo_branches() {
-  local repo=${COMP_WORDS[0]}
-  "$repo" branches 2>&1 | grep \| | sed 's/[ *][Pp ] *\([^ ]\+\) .*/\1/'
-}
-
-_list_repo_projects() {
-  local repo=${COMP_WORDS[0]}
-  "$repo" manifest -o /dev/stdout 2> /dev/null \
-    | grep 'project name=' \
-    | sed 's/.\+name="\([^"]\+\)".\+/\1/'
-}
-
-# Complete repo's <command> argument.
-_complete_repo_command() {
-  [ ${COMP_CWORD} -eq 1 ] || return 1
-  local command=${COMP_WORDS[1]}
-  COMPREPLY=($(compgen -W "$(_list_repo_commands)" -- "$command"))
-  return 0
-}
-
-_complete_repo_arg() {
-  [ ${COMP_CWORD} -gt 1 ] || return 1
-  local command=${COMP_WORDS[1]}
-  local current=${COMP_WORDS[COMP_CWORD]}
-  if [[ ${command} == "abandon" ]]; then
-    if [[ ${COMP_CWORD} -eq 2 ]]; then
-      COMPREPLY=($(compgen -W "$(_list_repo_branches)" -- "$current"))
-    else
-      COMPREPLY=($(compgen -W "$(_list_repo_projects)" -- "$current"))
-    fi
-    return 0
-  fi
-  if [[ ${command} == "help" ]]; then
-    [ ${COMP_CWORD} -eq 2 ] && \
-      COMPREPLY=($(compgen -W "$(_list_repo_commands)" -- "$current"))
-    return 0
-  fi
-  if [[ ${command} == "start" ]]; then
-    [ ${COMP_CWORD} -gt 2 ] && \
-      COMPREPLY=($(compgen -W "$(_list_repo_projects)" -- "$current"))
-    return 0
-  fi
-  return 1
-}
-
-# Complete repo arguments.
-_complete_repo() {
-  COMPREPLY=()
-  _complete_repo_command && return 0
-  _complete_repo_arg && return 0
+  _complete_flatcar_workon_command && return 0
   return 0
 }
 
@@ -234,8 +138,7 @@ complete -o bashdefault -o default -F _board_sysroot \
   image_to_usb.sh \
   mod_image_for_test.sh
 complete -o bashdefault -o default -o nospace -F _autotest_complete autotest
-complete -F _cros_workon cros_workon
-complete -F _complete_repo repo
+complete -F _flatcar_workon flatcar_workon
 
 ###  Local Variables:
 ###  mode: shell-script

build_library/build_image_util.sh

@@ -340,14 +340,13 @@ get_metadata() {
         if [ -z "${val}" ]; then
             # The grep invocation gives errors when the ebuild file is not present.
             # This can happen when the binary packages from ./build_packages are outdated.
-            val="$(grep "CROS_WORKON_PROJECT=" "${ebuild_path}" | cut -d '"' -f 2)"
+            val="$(grep "EGIT_REPO_URI=" "${ebuild_path}" | cut -d '"' -f 2)"
             if [ -n "${val}" ]; then
-                val="https://github.com/${val}"
                 # All github.com/flatcar projects specify their commit
                 local commit=""
-                commit="$(grep "CROS_WORKON_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)"
+                commit="$(grep "EGIT_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)"
                 if [ -n "${commit}" ]; then
-                    val="${val}/commit/${commit}"
+                    val="${val%.git}/commit/${commit}"
                 fi
             fi
         fi
@@ -539,7 +538,7 @@ insert_extra_slsa() {
 
 # Add an entry to the image's package.provided
 package_provided() {
-    local p profile="${BUILD_DIR}/configroot/etc/portage/profile"    
+    local p profile="${BUILD_DIR}/configroot/etc/portage/profile"
     for p in "$@"; do
         info "Writing $p to package.provided and soname.provided"
         echo "$p" >> "${profile}/package.provided"

build_packages

@@ -27,7 +27,7 @@ DEFINE_string getbinpkgver "" \
 DEFINE_boolean toolchainpkgonly "${FLAGS_FALSE}" \
   "Use binary packages only for the board toolchain."
 DEFINE_boolean workon "${FLAGS_TRUE}" \
-  "Automatically rebuild updated cros-workon packages."
+  "Automatically rebuild updated flatcar-workon packages."
 DEFINE_boolean fetchonly "${FLAGS_FALSE}" \
   "Don't build anything, instead only fetch what is needed."
 DEFINE_boolean rebuild "${FLAGS_FALSE}" \
@@ -169,16 +169,16 @@ if [[ "${FLAGS_debug_emerge}" -eq "${FLAGS_TRUE}" ]]; then
   EMERGE_FLAGS+=( --debug )
 fi
 
-# Build cros_workon packages when they are changed.
-CROS_WORKON_PKGS=()
-if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
-  CROS_WORKON_PKGS+=( $("${SRC_ROOT}/scripts/cros_workon" list --board=${FLAGS_board}) )
+# Build flatcar_workon packages when they are changed.
+WORKON_PKGS=()
+if [[ ${FLAGS_workon} -eq "${FLAGS_TRUE}" ]]; then
+  mapfile -t WORKON_PKGS < <("${SRC_ROOT}"/scripts/flatcar_workon list --board="${FLAGS_board}")
 fi
 
-if [[ ${#CROS_WORKON_PKGS[@]} -gt 0 ]]; then
+if [[ ${#WORKON_PKGS[@]} -gt 0 ]]; then
   EMERGE_FLAGS+=(
-    --reinstall-atoms="${CROS_WORKON_PKGS[*]}"
-    --usepkg-exclude="${CROS_WORKON_PKGS[*]}"
+    --reinstall-atoms="${WORKON_PKGS[*]}"
+    --usepkg-exclude="${WORKON_PKGS[*]}"
   )
 fi