diff options
| author | Tristan Muntsinger <muntsinger@google.com> | 2019-11-25 20:42:42 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 20:42:42 -0800 |
| commit | 414c4e0828b1c5baec31f8ae98ef16bfecb2bf4f (patch) | |
| tree | f23f01d3c3dfabc8d4b913095916e858a18e5fd8 | |
| parent | 3dbd71a1b79a22b10de6cfa10c4a7736db339a5a (diff) | |
| parent | d632696ba9a8808d244e3abe19faa616aa00fd9e (diff) | |
| download | cuttlefish_common-414c4e0828b1c5baec31f8ae98ef16bfecb2bf4f.tar.gz | |
Merge "Add kernel dir to manifest SHA for arm64 SHI"
am: d632696ba9
Change-Id: I2b3918590c0df22813188d2d585db7c7d2dc7493
| -rwxr-xr-x | tools/gen_sha.sh | 16 | ||||
| -rwxr-xr-x | tools/make_manifest.sh | 11 |
2 files changed, 25 insertions, 2 deletions
diff --git a/tools/gen_sha.sh b/tools/gen_sha.sh index cfe7ff27..dec71f73 100755 --- a/tools/gen_sha.sh +++ b/tools/gen_sha.sh @@ -16,6 +16,19 @@ source "${ANDROID_BUILD_TOP}/external/shflags/src/shflags" +DEFINE_string kernel \ + "" "Path to kernel build dir" "k" + +FLAGS_HELP="USAGE: $0 [flags]" + +FLAGS "$@" || exit $? +eval set -- "${FLAGS_ARGV}" + +if [ -z ${FLAGS_kernel} ]; then + flags_help + exit 1 +fi + cd "${ANDROID_BUILD_TOP}/device/google/cuttlefish_common" Sha=`git rev-parse HEAD` cd - >/dev/null @@ -25,4 +38,7 @@ cd - >/dev/null cd "${ANDROID_BUILD_TOP}/external/arm-trusted-firmware" Sha="$Sha,`git rev-parse HEAD`" cd - >/dev/null +cd "${FLAGS_kernel}" +Sha="$Sha,`git rev-parse HEAD`" +cd - >/dev/null echo $Sha diff --git a/tools/make_manifest.sh b/tools/make_manifest.sh index 1bdbff9b..a40ba269 100755 --- a/tools/make_manifest.sh +++ b/tools/make_manifest.sh @@ -34,8 +34,10 @@ DEFINE_string version \ "2" "Specify which manifest version to use (default: latest)" "v" DEFINE_string ethaddr \ "" "MAC address of device to DFU (default: all)" "m" +DEFINE_string kernel \ + "" "Path to kernel build dir" "k" -FLAGS_HELP="USAGE: $0 [flags]" +FLAGS_HELP="USAGE: $0 --kernel <dir> [flags]" FLAGS "$@" || exit $? eval set -- "${FLAGS_ARGV}" @@ -45,6 +47,11 @@ for arg in "$@" ; do exit 1 done +if [ -z ${FLAGS_kernel} ]; then + flags_help + exit 1 +fi + confirm() { read -r -p "${1:-Are you sure you want to continue? [y/N]} " response case "$response" in @@ -70,7 +77,7 @@ addKVToManifest() { } addShaToManifest() { - addKVToManifest "Sha" `./gen_sha.sh` + addKVToManifest "Sha" `./gen_sha.sh --kernel ${FLAGS_kernel}` } addPathToManifest() { |