commit e9beb8556fa357a9c374ca6b93d8f4c5c784f5e3
author LaMont Jones <lamontjones@chromium.org> Thu Dec 20 14:23:05 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Sun Dec 23 14:46:12 2018 -0800
tree 449cd01dd46b598ab17d67a89512d2a82c3445d8
parent 45964294fa4605e19d844b1f7165c2b48edc0554

image_signing: drop support for old_verity_argv images

We changed the verity kernel command line form before R16 was released
and included backwards compat support in the scripts for it.  But all
the devices that were released for these old versions are EOL, and we
don't need to sign images that old anymore, so drop support.

BRANCH=None
BUG=chromium:891015
TEST=precq passes

Change-Id: I5cc37fae19fb4b3db229598aa0f5c69a6f32005a
Reviewed-on: https://chromium-review.googlesource.com/1387904
Commit-Ready: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/image_signing/sign_official_build.sh

diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh
index 726a554..1ec4f12 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -110,14 +110,6 @@
   echo "$1" | sed -n "s/.*\b$2=\([^ \"]*\).*/\1/p"
 }
 
-is_old_verity_argv() {
-  local depth=$(echo "$1" | cut -f7 -d' ')
-  if [ "$depth" = "0" ]; then
-    return 0
-  fi
-  return 1
-}
-
 # Get the dmparams parameters from a kernel config.
 get_dmparams_from_config() {
   local kernel_config=$1
@@ -128,11 +120,7 @@
   local kernel_config=$1
   local dm_config=$(get_dmparams_from_config "${kernel_config}")
   local vroot_dev=$(get_dm_slave "${dm_config}" vroot)
-  if is_old_verity_argv "${vroot_dev}"; then
-    echo ${vroot_dev} | cut -f9 -d ' '
-  else
-    echo $(get_verity_arg "${vroot_dev}" root_hexdigest)
-  fi
+  echo $(get_verity_arg "${vroot_dev}" root_hexdigest)
 }
 
 # Get the slave device and its args