Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326 Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -86,7 +86,12 @@ function prepare_kernel_image()
|
|||||||
#EOF
|
#EOF
|
||||||
printf "generate ${dist_root}/prebuilt-info.txt with kernel\n"
|
printf "generate ${dist_root}/prebuilt-info.txt with kernel\n"
|
||||||
cksum "${out_root}/kernel-${kernel_version}${postfix}"
|
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"
|
local t="${out_root}/prebuilt-info.txt"
|
||||||
|
echo "{" > $t
|
||||||
|
echo -n " \"kernel-build-id\": " >> $t
|
||||||
|
strings "${out_root}/kernel-${kernel_version}${postfix}" |grep -E "Linux version [0-9]\." | sed -e 's/Linux version.*-ab//'| cut -f1 -d ' ' >> $t
|
||||||
|
echo "}" >> $t
|
||||||
|
cp $t ${dist_root}/prebuilt-info.txt
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,7 +136,8 @@ function update_kernel_prebuilts_with_artifact
|
|||||||
kernel-${kernel_version}-lz4-allsyms \
|
kernel-${kernel_version}-lz4-allsyms \
|
||||||
kernel-${kernel_version} \
|
kernel-${kernel_version} \
|
||||||
kernel-${kernel_version}-gz \
|
kernel-${kernel_version}-gz \
|
||||||
kernel-${kernel_version}-lz4"
|
kernel-${kernel_version}-lz4 \
|
||||||
|
prebuilt-info.txt"
|
||||||
printf "%20s\n --> %20s\n" "${out_root}" "${prebuilts_dir}"
|
printf "%20s\n --> %20s\n" "${out_root}" "${prebuilts_dir}"
|
||||||
for f in ${list}; do
|
for f in ${list}; do
|
||||||
echo \
|
echo \
|
||||||
|
|||||||
Reference in New Issue
Block a user