commit b89b537912549abaeb2070ad1d35406596f74c94
author Dmitry Torokhov <dtor@chromium.org> Mon Nov 01 20:30:12 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Nov 10 06:19:58 2021 +0000
tree 124c6430dfe954637027fd8200ca6c50916ed7c2
parent 7c612469f518b15fb60b02a0fc83ca9fa3cdfb8e

scripts: make sure hypervisor kernel does not litter rootfs

We do not need hypervisor kernel anywhere but in kernel partition(s), so
stop putting it into rootfs and adjust the base image script to pull it
out of board build directory.

BUG=b:204733585
TEST=Deploy ManaTEE build

Change-Id: I42eec9be15c1cfd8ea86e4430ee79bdff89e6177
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3258484
Commit-Queue: Dmitry Torokhov <dtor@chromium.org>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Reviewed-by: Junichi Uekawa <uekawa@chromium.org>
Reviewed-by: Allen Webb <allenwebb@google.com>
Reviewed-by: Alex Klein <saklein@chromium.org>

build_library/base_image_util.sh

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 1f049c8..baf4c2e 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -412,7 +412,7 @@
     "${arc_flags[@]}"
 
   # Copy the full lsb-release into the initramfs build root.
-  if has "minios" "$(portageq-${FLAGS_board} envvar USE)"; then
+  if has "minios" "$(portageq-"${FLAGS_board}" envvar USE)"; then
     sudo mkdir -p "${BOARD_ROOT}/build/initramfs/etc"
     sudo cp "${root_fs_dir}/etc/lsb-release" \
       "${BOARD_ROOT}/build/initramfs/etc/"
@@ -516,25 +516,24 @@
   # the bootable partitions later.
   mkdir -p "${BUILD_DIR}/boot_images"
 
-  # We either copy or move vmlinuz depending on whether it should be included
-  # in the final built image.  Boards that boot with legacy bioses
-  # need the kernel on the boot image, boards with coreboot/depthcharge
-  # boot from a boot partition.
-  if has "include_vmlinuz" "$(portageq-${FLAGS_board} envvar USE)"; then
+  # Bootable kernel image for ManaTEE enabled targets is located at directory
+  # ${BOARD_ROOT}/build/manatee/boot and included only in bootable partition.
+  # If no manatee USE flag is specified the standard /boot location is used,
+  # optionally including kernel image in final build image:
+  # - boards that boot with legacy bioses need the kernel on the boot image
+  # - boards with coreboot/depthcharge boot from a boot partition.
+  local boot_dir
+  local cpmv
+  if has "manatee" "$(portageq-"${FLAGS_board}" envvar USE)"; then
+    boot_dir="${BOARD_ROOT}/build/manatee/boot"
     cpmv="cp"
   else
-    cpmv="mv"
-  fi
-
-  # Bootable kernel image for ManaTEE enabled targets is located at
-  # directory /build/manatee/boot and included only in bootable partition.
-  # If no manatee USE flag is specified the standard /boot location
-  # is used, optionally including kernel image in final build image.
-  local boot_dir
-  if has "manatee" "$(portageq-${FLAGS_board} envvar USE)"; then
-    boot_dir="${root_fs_dir}/build/manatee/boot"
-  else
     boot_dir="${root_fs_dir}/boot"
+    if has "include_vmlinuz" "$(portageq-"${FLAGS_board}" envvar USE)"; then
+      cpmv="cp"
+    else
+      cpmv="mv"
+    fi
   fi
 
   [ -e "${boot_dir}"/Image-* ] && \
@@ -578,7 +577,7 @@
   fi
 
   # Build minios kernel and put it in the MINIOS-A partition of the image.
-  if has "minios" "$(portageq-${FLAGS_board} envvar USE)"; then
+  if has "minios" "$(portageq-"${FLAGS_board}" envvar USE)"; then
     build_minios --board "${BOARD}" --image "${BUILD_DIR}/${image_name}" \
       --version "${CHROMEOS_VERSION_STRING}"
   fi

common.sh

diff --git a/common.sh b/common.sh
index 9a935b0..c2a3b4e 100644
--- a/common.sh
+++ b/common.sh
@@ -399,6 +399,7 @@
   *.proto
   */.keep*
   /build/libexec/tast
+  /build/manatee
   /build/rootfs/dlc
   /build/share
   /etc/init.d