From f3e1facf7f8120341b428906e1b756b478ddf497 Mon Sep 17 00:00:00 2001
From: Howard Chen <howardsoc@google.com>
Date: Fri, 25 Mar 2022 12:53:00 +0800
Subject: [PATCH] Fix incorrect prebuilt-info.txt

The 8351194 has a kernel-build-id=8339614 in the prebuilt-info.txt.
This value is incorrect and should be 8350305. Fix this issue by
get the build id from artifact.

Bug: 198363484
Test: development/gsi/build_with_kernel/repack_kernels.sh aarch64
Change-Id: I4c0fd6273df4a794b7dddb5346d182e7fc91adf4
---
 gsi/build_with_kernel/repack_kernels_common.sh | 16 ++++++++++------
 1 file 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"
+
 }
 
 #