From 35b6f96567f9c8c8422d453ac279a79c7488b8bf Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Mon, 1 Nov 2021 17:02:02 +0800 Subject: [PATCH] Change android12-5.10 to android13-5.10 The aosp/master is using android13-5.10 for T. The fetch_kernel.sh is for testing. Bug: 198363484 Test: \ development/gsi/build_with_kernel/fetch_kernel.sh && \ development/gsi/build_with_kernel/repack_kernels.sh && \ development/gsi/build_with_kernel/kernel_info_to_dist.sh Change-Id: Iad16792312ba3dad8b3352534ecc3e184afc71cb --- gsi/build_with_kernel/fetch_kernel.sh | 35 +++++++++++++++++++++++++ gsi/build_with_kernel/repack_kernels.sh | 6 ++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100755 gsi/build_with_kernel/fetch_kernel.sh diff --git a/gsi/build_with_kernel/fetch_kernel.sh b/gsi/build_with_kernel/fetch_kernel.sh new file mode 100755 index 000000000..02a3091ae --- /dev/null +++ b/gsi/build_with_kernel/fetch_kernel.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Copyright (C) 2021 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. + +set -e + +FETCH=/google/data/ro/projects/android/fetch_artifact +BCHAINING=`pwd`/out/prebuilt_cached/artifacts/ + +function local_fetch() +{ + local name=$1 + local target=$2 + mkdir -p ${BCHAINING}/${name} + cd ${BCHAINING}/${name} + ${FETCH} --branch aosp_kernel-common-android13-5.10 --target ${target} --latest + cd - +} + +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 + diff --git a/gsi/build_with_kernel/repack_kernels.sh b/gsi/build_with_kernel/repack_kernels.sh index 46ad3ce24..adcfcac88 100755 --- a/gsi/build_with_kernel/repack_kernels.sh +++ b/gsi/build_with_kernel/repack_kernels.sh @@ -19,17 +19,17 @@ source development/gsi/build_with_kernel/repack_kernels_common.sh set -e prepare_kernel_image \ - "artifacts/common-android12-5_10-kernel_aarch64" \ + "artifacts/common-android13-5_10-kernel_aarch64" \ "5.10" \ "arm64" prepare_kernel_image \ - "artifacts/common-android12-5_10-kernel_debug_aarch64" \ + "artifacts/common-android13-5_10-kernel_debug_aarch64" \ "5.10" \ "arm64" \ "debug" prepare_kernel_modules \ - "artifacts/common-android12-5_10-kernel_virt_aarch64" \ + "artifacts/common-android13-5_10-kernel_virt_aarch64" \ "5.10" \ "arm64" \