Merge "Add script to update the 5.15 kernel build chaining" am: 186e40dc54

Original change: https://android-review.googlesource.com/c/platform/development/+/1993723

Change-Id: I52cb2e4d58d60320e1fba2cb91512263387ff62f

gsi/build_with_kernel/fetch_kernel.sh

@@ -23,9 +23,10 @@ function local_fetch()
 {
     local name=$1
     local target=$2
+    local version=$(echo $name | sed -e 's/common-//g' -e 's/-kernel.*//g' -e 's/_/\./g')
     mkdir -p ${BCHAINING}/${name}
     cd ${BCHAINING}/${name}
-    ${FETCH} --branch aosp_kernel-common-android13-5.10 --target ${target} --latest
+    ${FETCH} --branch aosp_kernel-common-${version} --target ${target} --latest
     cd -
 }
 
@@ -33,3 +34,6 @@ local_fetch common-android13-5_10-kernel_aarch64 kernel_aarch64
 local_fetch common-android13-5_10-kernel_debug_aarch64 kernel_debug_aarch64
 local_fetch common-android13-5_10-kernel_virt_aarch64 kernel_virt_aarch64
 
+local_fetch common-android13-5_15-kernel_aarch64 kernel_aarch64
+local_fetch common-android13-5_15-kernel_debug_aarch64 kernel_debug_aarch64
+local_fetch common-android13-5_15-kernel_virt_aarch64 kernel_virt_aarch64

gsi/build_with_kernel/repack_kernels.sh

@@ -35,3 +35,19 @@ prepare_kernel_modules \
   "artifacts/common-android13-5_10-kernel_virt_aarch64" \
   "5.10" \
   "arm64"
+
+prepare_kernel_image \
+  "artifacts/common-android13-5_15-kernel_aarch64" \
+  "5.15" \
+  "arm64"
+
+prepare_kernel_image \
+  "artifacts/common-android13-5_15-kernel_debug_aarch64" \
+  "5.15" \
+  "arm64" \
+  "debug"
+
+prepare_kernel_modules \
+  "artifacts/common-android13-5_15-kernel_virt_aarch64" \
+  "5.15" \
+  "arm64"

gsi/build_with_kernel/repack_kernels_common.sh

@@ -122,14 +122,16 @@ function update_kernel_prebuilts_with_artifact
   local out_root="${OUT_DIR}/target/kernel/${kernel_version}/${arch}"
   local prebuilts_dir="kernel/prebuilts/${kernel_version}/${arch}/"
   local list="\
-    kernel-5.10-allsyms \
-    kernel-5.10-gz-allsyms \
-    kernel-5.10-lz4-allsyms \
-    kernel-5.10 \
-    kernel-5.10-gz \
-    kernel-5.10-lz4"
+    kernel-${kernel_version}-allsyms \
+    kernel-${kernel_version}-gz-allsyms \
+    kernel-${kernel_version}-lz4-allsyms \
+    kernel-${kernel_version} \
+    kernel-${kernel_version}-gz \
+    kernel-${kernel_version}-lz4"
   printf "%20s\n --> %20s\n" "${out_root}" "${prebuilts_dir}"
   for f in ${list}; do
+    echo \
+    cp -f ${out_root}/$f ${prebuilts_dir}
     cp -f ${out_root}/$f ${prebuilts_dir}
   done
 }

gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright (C) 2022 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source development/gsi/build_with_kernel/repack_kernels_common.sh
+
+set -e
+
+update_kernel_prebuilts_with_artifact "5.15" "arm64"
+update_kernel_module_prebuilts_with_artifact "5.15" "arm64"