commit cdf7371d73423d375ecc40fcb4f840a92008d56d
author Adam Lesinski <adamlesinski@google.com> Mon Nov 22 12:42:05 2021 -0800
committer Commit Bot <commit-bot@chromium.org> Tue Dec 14 00:11:34 2021 +0000
tree 81d702b7c8632af9a6955742dce5c79970943a0b
parent ef74c27421362e008140cdc15bca00758033fb07

starnix: Skip boot-related tasks when there is no kernel

The Fuchsia Starnix image doesn't require a kernel. If the KERN-A
partition is of type "reserved", skip boot-related work.

BUG=chromium:209505710
TEST=Built amd64-starnix profile

Change-Id: Ie8e3a4f50241bae696fe2a4372abb8b4e457f090
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3296624
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Tested-by: Adam Lesinski <adamlesinski@google.com>
Commit-Queue: Adam Lesinski <adamlesinski@google.com>

build_library/base_image_util.sh

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 92a8dba..02f2d30 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -456,16 +456,27 @@
     enable_bootcache="--enable_bootcache"
   fi
 
-  ${BUILD_LIBRARY_DIR}/create_legacy_bootloader_templates.sh \
-    --arch=${ARCH} \
-    --board=${BOARD} \
-    --image_type="${image_type}" \
-    --to="${root_fs_dir}"/boot \
-    --boot_args="${FLAGS_boot_args}" \
-    --enable_serial="${FLAGS_enable_serial}" \
-    --loglevel="${FLAGS_loglevel}" \
+  # If the KERN-A partition is of type "reserved", there is no kernel.
+  # Skip the preparation of a bootable kernel partition.
+  local has_bootable_kernel=1
+  local kernel_part_num="$(get_layout_partition_number "${image_type}" KERN-A)"
+  local kernel_part_type="$(get_type "${image_type}" "${kernel_part_num}")"
+  if [[ "${kernel_part_type}" == "reserved" ]]; then
+    has_bootable_kernel=0
+  fi
+
+  if [[ "${has_bootable_kernel}" -eq 1 ]]; then
+    ${BUILD_LIBRARY_DIR}/create_legacy_bootloader_templates.sh \
+      --arch=${ARCH} \
+      --board=${BOARD} \
+      --image_type="${image_type}" \
+      --to="${root_fs_dir}"/boot \
+      --boot_args="${FLAGS_boot_args}" \
+      --enable_serial="${FLAGS_enable_serial}" \
+      --loglevel="${FLAGS_loglevel}" \
       ${enable_rootfs_verification} \
       ${enable_bootcache}
+  fi
 
   # Run board-specific build image function, if available.
   if type board_finalize_base_image &>/dev/null; then
@@ -574,7 +585,8 @@
     USE_DEV_KEYS="--use_dev_keys"
   fi
 
-  if [[ ${skip_kernelblock_install} -ne 1 ]]; then
+  if [[ "${skip_kernelblock_install}" -ne 1 \
+    && "${has_bootable_kernel}" -eq 1 ]]; then
     # Place flags before positional args.
     ${SCRIPTS_DIR}/bin/cros_make_image_bootable "${BUILD_DIR}" \
       ${image_name} ${USE_DEV_KEYS} --adjust_part="${FLAGS_adjust_part}"