diff options
author | Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> | 2023-01-02 07:26:58 +0800 |
---|---|---|
committer | Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> | 2023-02-14 23:35:32 +0800 |
commit | 81f6c3d865c6f3eb9c5f422ce5f4a63ad83a2218 (patch) | |
tree | 8990bc1e8fa5e4cd944d233ea9633f6daa983be2 | |
parent | 61087b670eae68a31d4407a53906dba71c4f9d78 (diff) |
create_base_image_arm.sh: look up kernel when Image is missingpaulliu-fix-prebuilt-kernel-name
The name of the kernel is now changed "kernel-VERSION".
We use find to match the kernel image instead of using "Image".
Change-Id: Ic02f037e8329170b4c3655555413021f2bf40a29
Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
-rwxr-xr-x | tools/create_base_image_arm.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/create_base_image_arm.sh b/tools/create_base_image_arm.sh index a5fe3ad66..5b4232f27 100755 --- a/tools/create_base_image_arm.sh +++ b/tools/create_base_image_arm.sh @@ -130,9 +130,14 @@ if [ ! -d "${kernel_dist_dir}" ]; then echo kernel_dist_dir="${kernel_dist_dir}" exit 1 fi +kernel_image=${kernel_dist_dir}/Image +if [ ! -e ${kernel_image} ]; then + kernel_image=$(find ${kernel_dist_dir} -regex '.*kernel-[0-9.]*' | sort | head -n 1) + echo "Use kernel image: ${kernel_image}" +fi ${ANDROID_BUILD_TOP}/kernel/tests/net/test/build_rootfs.sh \ -a arm64 -s bullseye-rockpi -n ${IMAGE} -r ${IMAGE}.initrd -e -g \ - -k ${kernel_dist_dir}/Image -i ${kernel_dist_dir}/initramfs.img \ + -k ${kernel_image} -i ${kernel_dist_dir}/initramfs.img \ -d ${kernel_dist_dir}/rk3399-rock-pi-4b.dtb:rockchip if [ $? -ne 0 ]; then echo "error: failed to build rootfs. exiting..." |