From 8b42ac8e2682ee763a13baffe815b771d2103403 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Wed, 17 Oct 2012 01:05:50 -0400
Subject: [PATCH] Key increment scripts: fix incrementing keys not in $PWD

Part of the recent rewrite dropped changing of the active dir to
${KEY_DIR}.  Meant the scripts needed to be run inside of the key
dir since not all functions take the key dir as an argument but
instead assume they're in ${PWD}.

BUG=None
TEST=Ran increment_kernel_subkey_and_key_mp.sh and saw it work
BRANCH=None

Change-Id: Icbc02f123e999d186d9c40fd16528a134397699e
Reviewed-on: https://gerrit.chromium.org/gerrit/35803
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
---
 scripts/keygeneration/common.sh                          | 2 ++
 scripts/keygeneration/increment_firmware_data_key.sh     | 3 ++-
 scripts/keygeneration/increment_kernel_data_key.sh       | 3 ++-
 scripts/keygeneration/increment_kernel_subkey.sh         | 3 ++-
 scripts/keygeneration/increment_kernel_subkey_and_key.sh | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/keygeneration/common.sh b/scripts/keygeneration/common.sh
index b7725add7d..c3c1c25df4 100755
--- a/scripts/keygeneration/common.sh
+++ b/scripts/keygeneration/common.sh
@@ -125,6 +125,8 @@ get_version() {
 # Loads the current versions prints them to stdout and sets the global version
 # variables: CURR_FIRMKEY_VER CURR_FIRM_VER CURR_KERNKEY_VER CURR_KERN_VER
 load_current_versions() {
+  local key_dir=$1
+  local VERSION_FILE="${key_dir}/${VERSION_FILE}"
   if [[ ! -f ${VERSION_FILE} ]]; then
     return 1
   fi
diff --git a/scripts/keygeneration/increment_firmware_data_key.sh b/scripts/keygeneration/increment_firmware_data_key.sh
index facd776df2..c6b65a45f8 100755
--- a/scripts/keygeneration/increment_firmware_data_key.sh
+++ b/scripts/keygeneration/increment_firmware_data_key.sh
@@ -24,9 +24,10 @@ fi
 KEY_DIR=$1
 
 main() {
-  load_current_versions
+  load_current_versions "${KEY_DIR}"
   new_firmkey_ver=$(increment_version "${KEY_DIR}" "firmware_key_version")
 
+  cd "${KEY_DIR}"
   backup_existing_firmware_keys ${CURR_FIRM_VER} ${CURR_FIRMKEY_VER}
 
   cat <<EOF
diff --git a/scripts/keygeneration/increment_kernel_data_key.sh b/scripts/keygeneration/increment_kernel_data_key.sh
index 193df2ae7d..b3ed3ea5fd 100755
--- a/scripts/keygeneration/increment_kernel_data_key.sh
+++ b/scripts/keygeneration/increment_kernel_data_key.sh
@@ -24,9 +24,10 @@ fi
 KEY_DIR=$1
 
 main() {
-  load_current_versions
+  load_current_versions "${KEY_DIR}"
   new_kernkey_ver=$(increment_version "${KEY_DIR}" "kernel_key_version")
 
+  cd "${KEY_DIR}"
   backup_existing_kernel_data_keys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER}
 
   cat <<EOF
diff --git a/scripts/keygeneration/increment_kernel_subkey.sh b/scripts/keygeneration/increment_kernel_subkey.sh
index b18847e75c..ccac937319 100755
--- a/scripts/keygeneration/increment_kernel_subkey.sh
+++ b/scripts/keygeneration/increment_kernel_subkey.sh
@@ -24,9 +24,10 @@ fi
 KEY_DIR=$1
 
 main() {
-  load_current_versions
+  load_current_versions "${KEY_DIR}"
   new_firm_ver=$(increment_version "${KEY_DIR}" "firmware_version")
 
+  cd "${KEY_DIR}"
   backup_existing_kernel_subkeys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER}
 
   cat <<EOF
diff --git a/scripts/keygeneration/increment_kernel_subkey_and_key.sh b/scripts/keygeneration/increment_kernel_subkey_and_key.sh
index ac8466052c..dda0416699 100755
--- a/scripts/keygeneration/increment_kernel_subkey_and_key.sh
+++ b/scripts/keygeneration/increment_kernel_subkey_and_key.sh
@@ -25,10 +25,11 @@ fi
 KEY_DIR=$1
 
 main() {
-  load_current_versions
+  load_current_versions "${KEY_DIR}"
   new_kernkey_ver=$(increment_version "${KEY_DIR}" "kernel_key_version")
   new_firm_ver=$(increment_version "${KEY_DIR}" "firmware_version")
 
+  cd "${KEY_DIR}"
   backup_existing_kernel_subkeys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER}
   backup_existing_kernel_data_keys ${CURR_FIRM_VER} ${CURR_KERNKEY_VER}