scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-16 10:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Key increment scripts: fix incrementing keys not in $PWD

Browse Source 
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>
This commit is contained in:
Mike Frysinger
2012-10-17 01:05:50 -04:00
committed by Gerrit
parent b59d06e6e8
commit 8b42ac8e26
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/keygeneration/common.sh
View File

@@ -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

3
scripts/keygeneration/increment_firmware_data_key.sh
View File

@@ -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

3
scripts/keygeneration/increment_kernel_data_key.sh
View File

@@ -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

3
scripts/keygeneration/increment_kernel_subkey.sh
View File

@@ -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

3
scripts/keygeneration/increment_kernel_subkey_and_key.sh
View File

@@ -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}