diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-20 07:44:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 07:44:12 +0000 |
| commit | c9f314173524340cafb6209384126d953d3d9815 (patch) | |
| tree | fda7b3bc181369a978064bf988ba8bf1bc28a55e | |
| parent | 85276131896a4d2a7ee853f0ae74649fdac9338e (diff) | |
| parent | 19cd0dcbd204fb38ac63f49078f64e8509a85e7c (diff) | |
| download | development-c9f314173524340cafb6209384126d953d3d9815.tar.gz | |
Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647
Change-Id: I4c164e420979ca0fe0cfb796829feb93bfabe944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | gsi/build_with_kernel/repack_kernels_common.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gsi/build_with_kernel/repack_kernels_common.sh b/gsi/build_with_kernel/repack_kernels_common.sh index fe750aca1..401553854 100755 --- a/gsi/build_with_kernel/repack_kernels_common.sh +++ b/gsi/build_with_kernel/repack_kernels_common.sh @@ -78,12 +78,16 @@ function prepare_kernel_image() mkdir -p "${dist_root}" # Prepare prebuilt-info.txt - BID=$(cat "${prebuilts_root}/BUILD_INFO" | sed -n 's/^.*"bid":\s*"\(.*\)".*$/\1/p') - cat > "${dist_root}/prebuilt-info.txt" <<EOF -{ - "kernel-build-id": ${BID} -} -EOF +# BID=$(cat "${prebuilts_root}/BUILD_INFO" | sed -n 's/^.*"bid":\s*"\(.*\)".*$/\1/p') +# cat > "${dist_root}/prebuilt-info.txt" <<EOF +#{ +# "kernel-build-id": ${BID} +#} +#EOF + printf "generate ${dist_root}/prebuilt-info.txt with kernel\n" + cksum "${out_root}/kernel-${kernel_version}${postfix}" + strings "${out_root}/kernel-${kernel_version}${postfix}" |grep -E "Linux version [0-9]\." | sed -e 's/Linux version.*-ab//'| cut -f1 -d ' ' > "${dist_root}/prebuilt-info.txt" + } # |